This commit was manufactured by cvs2svn to create tag 'v200911080705'.
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 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 849a03b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
-src.zip
-javaCompiler...args
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 12dac85..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.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.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 f9b73ed..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Thu May 31 13:10:18 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-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=error
-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.5
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 a2bb559..0000000
--- 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 f30804c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.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.consumption.ui; singleton:=true
-Bundle-Version: 1.0.305.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;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;x-internal:=true,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.axis.consumption.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.apache.axis;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
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 c772b64..0000000
--- 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 7a4927e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-
-#
-# 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
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_AXIS_EMITTER=Axis Emitter
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 79917a4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,40 +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.StringToIProjectTransformer"/>
-        <map
-              key="CustomizeClientMappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand"
-              property="CustomizeClientMappings"
-              transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>                                 
- 		<map
-              key="Mappings"
-              operation="org.eclipse.jst.ws.internal.axis.consumption.ui.task.ClientCodeGenOperation"
-              property="JavaWSDLParam"
-              transform="org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParamModifier"/>
-  </extension> 
-     <extension
-            point="org.eclipse.ui.preferencePages">     
-      <page
-            name="%PREFERENCE_CATEGORY_AXIS_EMITTER"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.preferences.AxisEmitterPreferencePage">
-      </page>
-
-   </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 e8aa870..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUI.properties
+++ /dev/null
@@ -1,106 +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
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20060216   126989 pmoogk@ca.ibm.com - Peter Moogk
-# 20060329   127016 andyzhai@ca.ibm.com - Andy Zhai
-# 20060424   120137 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-
-#
-# 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 Axis Emitter Preference Page
-TOOLTIP_PPAE_PAGE=Set preferences that control Axis Emitter.
-TOOLTIP_PPAE_CHECKBOX_ALL_WANTED=By default, code is generated only for referenced elements. \nCall bGenerateAll(true) and WSDL2Java will generate code \nfor all elements in the scope regardless of whether they are referenced. \nScope means: by default, all WSDL files; if generateImports(false),\nthen only the immediate WSDL file.
-TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED=Emits separate Helper classes for meta data.
-TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS=Prefers building beans to straight arrays for wrapped XML array types.
-TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS=If this option is selected, the Java2WSDL parser will look into extended classes to determine the list of methods to export into the WSDL file.
-TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC=If selected, the tools will examine the Java service class and its value types to determine if it satisfies important requirements of the JAX-RPC specification.    
-TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE=Add scope to deploy.wsdd.
-TOOLTIP_PPAE_FIELD_TIME_OUT=Timeout in seconds (default is 45, specify -1 to disable).
-TOOLTIP_PPAE_GROUP_WSDL2JAVA=Set preferences for wsdl2java.
-TOOLTIP_PPAE_GROUP_JAVA2WSDL=Set preferences for java2wsdl.
-BUTTON_ALL_WANTED=&Generate code for all elements, even unreferenced ones
-BUTTON_HELPER_WANTED=Emits separate &helper classes for meta data
-BUTTON_WRAP_ARRAYS=Prefers building beans to straight arrays for &wrapped XML array types
-BUTTON_USE_INHERITED_METHODS=Look for allowed &methods in inherited class
-BUTTON_VALIDATE_AGAINST_JAXRPC=Analyze the service class for compliance to JAX-RPC before generating code
-LABEL_DEPLOY_SCOPE=Add &scope to deploy.wsdd:
-LABEL_TIME_OUT=&Timeout in seconds:
-GROUP_WSDL2JAVA_NAME=Wsdl2Java
-GROUP_JAVA2WSDL_NAME=Java2Wsdl
-DEPLOY_SCOPE_APPLICATION=Application
-DEPLOY_SCOPE_REQUEST=Request
-DEPLOY_SCOPE_SESSION=Session
-MSG_ERROR_INVALID_TIME_OUT=Invalid timeout! Timeout should be positive integer or -1 to disable.
-MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT=Using timeout value (in milliseconds) from JVM arguments AxisWsdl2JavaTimeout
-
-
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 6f4038e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/AxisConsumptionUIMessages.java
+++ /dev/null
@@ -1,81 +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
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd   bug     Email and other contact information
- * 20060329   127016 andyzhai@ca.ibm.com - Andy Zhai
- * 20060424   120137 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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 TOOLTIP_PPAE_PAGE;
-	public static String TOOLTIP_PPAE_CHECKBOX_ALL_WANTED;
-	public static String TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED;
-	public static String TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS;
-	public static String TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS;
-	public static String TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC;
-	public static String TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE;
-	public static String TOOLTIP_PPAE_FIELD_TIME_OUT;
-	public static String TOOLTIP_PPAE_GROUP_WSDL2JAVA;
-	public static String TOOLTIP_PPAE_GROUP_JAVA2WSDL;	
-	public static String BUTTON_ALL_WANTED;
-	public static String BUTTON_HELPER_WANTED;
-	public static String BUTTON_WRAP_ARRAYS;
-	public static String BUTTON_USE_INHERITED_METHODS;
-	public static String BUTTON_VALIDATE_AGAINST_JAXRPC;
-	public static String LABEL_DEPLOY_SCOPE;
-	public static String LABEL_TIME_OUT;
-	public static String GROUP_WSDL2JAVA_NAME;
-	public static String GROUP_JAVA2WSDL_NAME;
-	public static String DEPLOY_SCOPE_APPLICATION;
-	public static String DEPLOY_SCOPE_REQUEST;
-	public static String DEPLOY_SCOPE_SESSION;
-	public static String MSG_ERROR_INVALID_TIME_OUT;
-	public static String MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT;
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, AxisConsumptionUIMessages.class);
-	}
-}
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 dd21b83..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,263 +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.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 7c9edf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,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 9f729fc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,58 +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
- * -------- -------- -----------------------------------------------------------
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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_;
-	private String proxyEndpoint_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientOutputCommand() {
-		}
-		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
-			wsc_ = wsc;
-		}
-		
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{	
-		wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
-		wsc_.getWebServiceClientInfo().setProxyEndpoint(proxyEndpoint_);
-		return Status.OK_STATUS;
-	  }
-
-	public void setProxyBean(String proxyBean) {
-		this.proxyBean_ = proxyBean;
-	}
-
-	public void setProxyEndpoint(String proxyEndpoint) {
-		this.proxyEndpoint_ = proxyEndpoint;
-	}
-	  
-		
-}
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 02fa4e7..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070815   188999 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-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.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.command.internal.env.eclipse.BaseEclipseEnvironment;
-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 = ((BaseEclipseEnvironment)env).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 12c5ec3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503   126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122   215866 trungha@ca.ibm.com - Trung Ha
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-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.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.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_;
-	private String						outputFolder_;
-
-	public DefaultsForClientJavaWSDLCommand()
-	{
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
-	{
-		IEnvironment environment = getEnvironment();
-		IStatus status;
-		
-		if( outputFolder_ == null )
-		{
-			IPath[] paths = ResourceUtils.getAllJavaSourceLocations(proxyProject_);
-			outputFolder_ = paths[0].toString();
-		}
-		
-		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();
-			IPath javaOutput = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
-			javaWSDLParam_.setJavaOutput(javaOutput.toString());
-			
-
-			IPath webModulePath = ResourceUtils.getWebComponentServerRootPath(proxyProject_);
-			// 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
-			if (ResourceUtils.isJavaProject(proxyProject_))
-			{
-				IPath output = ResourceUtils.findResource( new Path( outputFolder_ )).getLocation();
-				javaWSDLParam_.setJavaOutput(output.toString());
-				javaWSDLParam_.setOutput(output.toString());
-			}
-			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;
-	}
-
-	public String getOutputFolder()
-	{
-	  return outputFolder_;	
-	}
-	
-	public void setOutputFolder(String outputFolder)
-	{
-		outputFolder_ = outputFolder;
-	}
-}
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 1330bdd..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,105 +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.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/preferences/AxisEmitterPreferencePage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
deleted file mode 100644
index c66cc60..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/preferences/AxisEmitterPreferencePage.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * yyyymmdd   bug     Email and other contact information
- * 20060329   127016 andyzhai@ca.ibm.com - Andy Zhai    
- * 20080428   224726 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.preferences;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext;
-import org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterDefaults;
-import org.eclipse.jst.ws.internal.axis.consumption.core.plugin.WebServiceAxisConsumptionCorePlugin;
-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.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-
-
-public class AxisEmitterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-  /*CONTEXT_ID PPAE0001 for the Axis Emitter Preference Page*/
-  private String INFOPOP_PPAE_PAGE = WebServiceAxisConsumptionUIPlugin.ID + ".PPAE0001";
-  //
-  private Button allWanted;
-  /*CONTEXT_ID PPAE0002 for the all wanted check box on the Axis Emitter Preference Page*/
-  private String INFOPOP_PPAE_CHECKBOX_ALL_WANTED = "PPAE0002";
-  //
-  private Button helperWanted;
-  /*CONTEXT_ID PPAE0003 for helper wanted check box on the Axis Emitter Preference Page*/
-  private String INFOPOP_PPAE_CHECKBOX_HELPER_WANTED = "PPAE0003";
-  //
-  private Button wrapArrays;
-  /*CONTEXT_ID PPAE0004 for the wrap arrays check box on the Axis Emitter Preference Page*/
-  private String INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS = "PPAE0004";
-
-  private Combo deployScopeTypes;
-  //*CONTEXT_ID PPAE0005 for the deploy scope type combo box on the Axis Emitter page*/
-  private String INFOPOP_PPAE_COMBO_DEPLOY_SCOPE = "PPAE0005";
-  
-  private StackLayout timeOutSubCompositeStackLayout;
-  
-  private Text timeOutField;
-  int timeOut;
-  String wsdl2JavaTimeoutProperty = System.getProperty("AxisWsdl2JavaTimeout");
-  
-  private Text timeOutMsgText;
-  /*CONTEXT_ID PPAE0006 for the time out field on the Axis Emitter Preference page*/
-  private String INFOPOP_PPAE_FIELD_TIME_OUT = "PPAE0006";
-
-  private Button useInheritedMethods;
-  /*CONTEXT_ID PPAE0007 for the use inherited methods check box on the Axis Emitter Preference page*/
-  private String INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS = "PPAE0007";
-
-  private Button validateAgainstJAXRPC;
-  /*CONTEXT_ID PPAE0010 for the "validate against JAXRPC..." check box on the Axis Emitter Preference page*/
-  private String INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC = "PPAE0010";
-  
-  /*CONTEXT_ID PPAE0008 for the wsdl2java group on the Axis Emitter Preference page*/
-  private String INFOPOP_PPAE_GROUP_WSDL2JAVA = "PPAE0008";
-  /*CONTEXT_ID PPAE0009 for the java2wsdl group on the Axis Emitter Preference page*/
-  private String INFOPOP_PPAE_GROUP_JAVA2WSDL = "PPAE0009";
-/**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-	UIUtils utils = new UIUtils( WebServiceAxisConsumptionUIPlugin.ID );
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_PAGE);
-    helpSystem.setHelp(parent, INFOPOP_PPAE_PAGE);
-    Group wsdl2JavaGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_WSDL2JAVA_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_WSDL2JAVA, INFOPOP_PPAE_GROUP_WSDL2JAVA, 2, 10,10);
-    allWanted = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_ALL_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_ALL_WANTED,INFOPOP_PPAE_CHECKBOX_ALL_WANTED);
-
-    helperWanted  = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_HELPER_WANTED,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_HELPER_WANTED,INFOPOP_PPAE_CHECKBOX_HELPER_WANTED);
-
-    wrapArrays = createCheckBox(wsdl2JavaGroup, AxisConsumptionUIMessages.BUTTON_WRAP_ARRAYS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_WRAP_ARRAYS,INFOPOP_PPAE_CHECKBOX_WRAP_ARRAYS);    
-    
-    deployScopeTypes = utils.createCombo(wsdl2JavaGroup, AxisConsumptionUIMessages.LABEL_DEPLOY_SCOPE, AxisConsumptionUIMessages.TOOLTIP_PPAE_COMBO_DEPLOY_SCOPE, INFOPOP_PPAE_COMBO_DEPLOY_SCOPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-    /* 
-     * Ensure the order is the same as it in the fields for class
-     * org.eclipse.jst.ws.internal.axis.consumption.core.context.AxisEmitterContext
-     */
-    deployScopeTypes.setItems(new String []{AxisConsumptionUIMessages.DEPLOY_SCOPE_APPLICATION, AxisConsumptionUIMessages.DEPLOY_SCOPE_REQUEST,AxisConsumptionUIMessages.DEPLOY_SCOPE_SESSION});
-    
-    Label timeoutLabel = new Label(wsdl2JavaGroup, SWT.WRAP);
-    timeoutLabel.setText(AxisConsumptionUIMessages.LABEL_TIME_OUT);
-    timeoutLabel.setToolTipText(AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT);
-    
-    Composite timeOutSubComposite = utils.createComposite(wsdl2JavaGroup, 1);
-    timeOutSubCompositeStackLayout = new StackLayout();
-    timeOutSubComposite.setLayout(timeOutSubCompositeStackLayout);
-    
-    // only one of this is displayed at one time, they share infopop and tooltip text
-    timeOutField = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
-    timeOutMsgText = createTextField(timeOutSubComposite, null ,AxisConsumptionUIMessages.TOOLTIP_PPAE_FIELD_TIME_OUT,INFOPOP_PPAE_FIELD_TIME_OUT);
-    
-    timeOutMsgText.setEditable(false);
-    
-    Group java2WsdlGroup = utils.createGroup(parent, AxisConsumptionUIMessages.GROUP_JAVA2WSDL_NAME, AxisConsumptionUIMessages.TOOLTIP_PPAE_GROUP_JAVA2WSDL, INFOPOP_PPAE_GROUP_JAVA2WSDL, 2, 10,10);
-    useInheritedMethods = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_USE_INHERITED_METHODS,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_USE_INHERITED_METHODS,INFOPOP_PPAE_CHECKBOX_USE_INHERITED_METHODS);
-    validateAgainstJAXRPC = createCheckBox(java2WsdlGroup, AxisConsumptionUIMessages.BUTTON_VALIDATE_AGAINST_JAXRPC,AxisConsumptionUIMessages.TOOLTIP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC,INFOPOP_PPAE_CHECKBOX_VALIDATE_AGAINST_JAXRPC);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-  
-  /**
-   * Creates checkbox with horizontalSpan = 2 in its grid data in order to
-   * match the grid layout for combo 
-   */
-  private Button createCheckBox( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText(labelName);
-    button.setToolTipText( tooltip );
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
-	GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-	gd.horizontalSpan= 2;
-	button.setLayoutData(gd);	
-    return button;
-  }
-     
-  private Text createTextField(Composite parent,String labelName, String tooltip, String infopop) 
-  { 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, SWT.SINGLE | SWT.BORDER);
-     GridData data = new GridData();
-     data.verticalAlignment = GridData.FILL;
-     data.horizontalAlignment = GridData.FILL;
-     data.grabExcessHorizontalSpace = true;
-     text.setLayoutData(data);
-     text.setToolTipText(tooltip);
-     if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, WebServiceAxisConsumptionUIPlugin.ID + "." + infopop );
-     
-     text.addModifyListener( new ModifyListener() {
-		public void modifyText(ModifyEvent e) {
-			numberFieldChanged((Text) e.widget);
-		}
-	 }
-     );
-     return text;
-  }
-
-  /**
-   * 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()
-  {
-    if(validateNumber(timeOutField.getText()).isOK())
-    	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()
-  {
-    allWanted.setSelection( AxisEmitterDefaults.getAllWantedDefault());
-    helperWanted.setSelection( AxisEmitterDefaults.getHelperWantedDefault());
-    wrapArrays.setSelection( AxisEmitterDefaults.getWrapArraysDefault());
-    deployScopeTypes.select(AxisEmitterDefaults.getDeployScopeDefault());
-    if (wsdl2JavaTimeoutProperty != null) timeOutField.setText(""+ getTimeOutValueWithProperty());
-    else timeOutField.setText("" + AxisEmitterDefaults.getTimeOutDefault());	
-    useInheritedMethods.setSelection(AxisEmitterDefaults.getUseInheritedMethodsDefault());
-    validateAgainstJAXRPC.setSelection(AxisEmitterDefaults.getValidateAgainstJAXRPC());
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues()
-  {
-    // get the persistent context from the plugin
-    AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
-    allWanted.setSelection( context.isAllWantedEnabled());
-    helperWanted.setSelection( context.isHelperWantedEnabled());
-    wrapArrays.setSelection( context.isWrapArraysEnabled());
-    deployScopeTypes.select(context.getDeployScopeType());
-    useInheritedMethods.setSelection( context.isUseInheritedMethodsEnabled());
-    validateAgainstJAXRPC.setSelection( context.isValidateAgainstJAXRPCEnabled() );
-    if (wsdl2JavaTimeoutProperty != null) 
-    {	timeOut=getTimeOutValueWithProperty();
-    	//timeOutField.setEnabled(false);
-    	timeOutSubCompositeStackLayout.topControl = timeOutMsgText;
-        timeOutMsgText.setText(AxisConsumptionUIMessages.MSG_USE_JVM_ARGUMENT_FOR_TIME_OUT);		
-    }
-	else
-	{
-	    timeOut = context.getTimeOut();
-	    timeOutSubCompositeStackLayout.topControl = timeOutField;
-	}
-    timeOutField.setText(""+ timeOut);
-   }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    // get the persistent context from the plugin
-    AxisEmitterContext context = WebServiceAxisConsumptionCorePlugin.getInstance().getAxisEmitterContext();
-    context.setAllWantedEnabled( allWanted.getSelection() );
-    context.setHelperWantedEnabled( helperWanted.getSelection() );
-    context.setWrapArraysEnabled( wrapArrays.getSelection() );
-    context.selectDeployScopeType(deployScopeTypes.getSelectionIndex());
-    timeOut = Integer.parseInt(timeOutField.getText().trim());
-    context.setTimeOut(timeOut);
-    context.setUseInheritedMethodsEnabled( useInheritedMethods.getSelection() );
-    context.setValidateAgainstJAXRPCEnabled( validateAgainstJAXRPC.getSelection() );
-  }
-  
-  private void numberFieldChanged(Text textControl) {
-		IStatus status = validateNumber(textControl.getText());
-		setValid(!status.matches(IStatus.ERROR));
-		applyToStatusLine(this,status);	
- }
-  
-  private int getTimeOutValueWithProperty() 
-  {
-	  if (wsdl2JavaTimeoutProperty != null)
-	  {	try {
-		  long timeOutProperty = Long.parseLong(wsdl2JavaTimeoutProperty);
-		  if (timeOutProperty < 0) return -1; // timeout = -1 equals never time out; treating all negative number as -1
-		  else return (int)Math.ceil(timeOutProperty/1000.0);
-	    } catch (NumberFormatException e){
-	      System.err.print("AxisWSDL2JavaTimeout is not a valid number");
-	      return AxisEmitterDefaults.getTimeOutDefault();
-	    }
-	  }
-	  else return AxisEmitterDefaults.getTimeOutDefault();
-  }
-  
-  private IStatus validateNumber(String numberString)
-  {
-	    IStatus status;
-		try 
-		{
-			int number = Integer.parseInt(numberString);
-			if (number <= 0 && number != -1)
-			{
-				status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
-						AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
-			}
-			else
-			{	timeOut = number;
-				status = Status.OK_STATUS;
-				//we set param:message="" here, Later in 
-				//applyToStatusLine(), we do page.setMessage(null,type) 
-				status = new Status(IStatus.OK, WebServiceAxisConsumptionUIPlugin.ID, IStatus.OK, "",null);
-			}
-		} 
-		catch 
-		(NumberFormatException e) 
-		{
-			status = new Status(IStatus.ERROR, WebServiceAxisConsumptionUIPlugin.ID, IStatus.ERROR,
-					AxisConsumptionUIMessages.MSG_ERROR_INVALID_TIME_OUT, null);
-		}
-		return status; 
-  	}
-  
-	private void applyToStatusLine(DialogPage page, IStatus status) {
-		String message= status.getMessage();
-		switch (status.getSeverity()) {
-			case IStatus.OK:
-				page.setMessage(null, IMessageProvider.NONE);
-				page.setErrorMessage(null);
-				break;
-			case IStatus.WARNING:
-				page.setMessage(message, IMessageProvider.WARNING);
-				page.setErrorMessage(null);
-				break;				
-			case IStatus.INFO:
-				page.setMessage(message, IMessageProvider.INFORMATION);
-				page.setErrorMessage(null);
-				break;			
-			default:
-				if (message.length() == 0) {
-					message= null;
-				}
-				page.setMessage(null);
-				page.setErrorMessage(message);
-				break;		
-		}
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
deleted file mode 100644
index f8dcdf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ClientCodeGenOperation.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060509   125094 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20080603   235367 makandre@ca.ibm.com - Andrew Mak, "IWAB0014E Unexpected exception occurred" from ant task for web service client generation
- * 20080626   229867 makandre@ca.ibm.com - Andrew Mak, Missing method in generated proxy class
- * 20080709   240225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-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 ClientCodeGenOperation extends AbstractDataModelOperation {
-	
-	private CopyAxisJarCommand copyAxisJarCommand = null;
-	
-	private WSDL2JavaCommand wsdl2JavaCommand = null;
-	private JavaWSDLParameter javaWSDLParam;
-	private String wsdlURI;
-	
-	private IProject project;
-	
-	private Stub2BeanCommand stub2BeanCommand = null;
-	private WebServicesParser webServicesParser;
-	private String outputFolder;
-	private String proxyBean;
-	private String proxyEndpoint;
-	
-	private RefreshProjectCommand refreshProjectCommand = null;
-
-	public ClientCodeGenOperation(){
-		copyAxisJarCommand = new CopyAxisJarCommand();
-		wsdl2JavaCommand = new WSDL2JavaCommand();
-		stub2BeanCommand = new Stub2BeanCommand();
-		refreshProjectCommand = new RefreshProjectCommand();
-	}
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
-
-		IEnvironment env = getEnvironment();
-		ClientWSModifyOperation buOperation = new ClientWSModifyOperation(info, env);
-		try {
-			buOperation.execute(monitor);
-		}
-		catch(CoreException ce){
-			IStatus status = ce.getStatus();
-			return status;
-		}
-		return Status.OK_STATUS;
-
-	}
-
-	
-	private class ClientWSModifyOperation extends WorkspaceModifyOperation {
-		
-		  private IAdaptable info = null;
-		  private IEnvironment env = null;
-
-		  
-		  protected ClientWSModifyOperation(IAdaptable adaptable, IEnvironment environment){
-			  info = adaptable;
-			  env = environment;
-		  }
-		  
-		  protected void execute(IProgressMonitor monitor) throws CoreException{
-		  
-			    IStatus status = null;
-
-			    // CopyAxisJarCommand
-			    copyAxisJarCommand.setEnvironment(env);
-			    copyAxisJarCommand.setProject(project);
-			    status = copyAxisJarCommand.execute(monitor, info);
-			    if (status.getSeverity() == Status.ERROR){
-			    	throw new CoreException(status);
-			    }
-				
-				// WSDL2JavaCommand
-				wsdl2JavaCommand.setEnvironment(env);
-				wsdl2JavaCommand.setJavaWSDLParam(javaWSDLParam);
-				wsdl2JavaCommand.setWsdlURI(wsdlURI);
-				status = wsdl2JavaCommand.execute(monitor, info);
-				if (status.getSeverity() == Status.ERROR) {
-					throw new CoreException(status);
-				}
-								
-				// Stub2BeanCommand
-				stub2BeanCommand.setEnvironment(env);
-				stub2BeanCommand.setWebServicesParser(webServicesParser);
-				stub2BeanCommand.setOutputFolder(outputFolder);
-				stub2BeanCommand.setJavaWSDLParam(javaWSDLParam);
-				stub2BeanCommand.setClientProject(project);
-				status = stub2BeanCommand.execute(monitor, info);
-				if (status.getSeverity() == Status.ERROR) {
-					throw new CoreException(status);
-				}
-				proxyBean = stub2BeanCommand.getProxyBean();
-				proxyEndpoint = stub2BeanCommand.getProxyEndpoint();
-			  
-				// RefreshProjectCommand
-				refreshProjectCommand.setEnvironment(env);
-				refreshProjectCommand.setProject(project);
-				status = refreshProjectCommand.execute(monitor, info);
-				if (status.getSeverity() == Status.ERROR) {
-					throw new CoreException(status);
-				}
-				
-		  }
-		
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam;
-	}
-	
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam = javaWSDLParam;
-	}
-
-	public void setOutputFolder(String outputFolder) {
-		this.outputFolder = outputFolder;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-	public void setWebServicesParser(WebServicesParser webServicesParser) {
-		this.webServicesParser = webServicesParser;
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		this.wsdlURI = wsdlURI;
-	}
-		
-	public String getProxyBean() {
-		return proxyBean;
-	}
-	
-	public String getProxyEndpoint() {
-		return proxyEndpoint;
-	}
-	
-}
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 c2d0fc1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060509   125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517   142342 kathy@ca.ibm.com - Kathy Chan
- * 20060828	  155439 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070501   184505 kathy@ca.ibm.com - Kathy Chan
- * 20070502   184505 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102   208620 kathy@ca.ibm.com - Kathy Chan, Update JAR sizes
- * 20071102   202222 kathy@ca.ibm.com - Kathy Chan
- * 20080122   216165 kathy@ca.ibm.com - Kathy Chan
- * 20080326   224148 makandre@ca.ibm.com - Andrew Mak, Web service scenarios broke in latest builds with Equinox p2
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-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.FileLocator;
-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.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_JAR = "axis.jar"; //$NON-NLS-1$
-	public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
-	public static String COMMON_DISCOVERY_PLUGIN_ID = "org.apache.commons.discovery"; //$NON-NLS-1$
-	public static String COMMON_DISCOVERY_JAR = "commons-discovery-0.2.jar"; //$NON-NLS-1$
-	public static String JAVAX_XML_RPC_PLUGIN_ID = "javax.xml.rpc"; //$NON-NLS-1$
-	public static String JAVAX_XML_RPC_JAR = "jaxrpc.jar"; //$NON-NLS-1$
-	public static String JAVAX_XML_SOAP_PLUGIN_ID = "javax.xml.soap"; //$NON-NLS-1$
-	public static String JAVAX_XML_SOAP_JAR = "saaj.jar"; //$NON-NLS-1$
-	public static String JAVAX_WSDL_PLUGIN_ID = "javax.wsdl"; //$NON-NLS-1$
-	public static String JAVAX_WSDL_JAR = "wsdl4j.jar"; //$NON-NLS-1$
-	public static String COMMON_LOGGING_PLUGIN_ID = "org.apache.commons.logging"; //$NON-NLS-1$
-	public static String COMMON_LOGGING_JAR = "commons-logging.jar"; //$NON-NLS-1$
-	private static long AXIS_JAR_SIZE = 1588063L;
-	private static long COMMON_DISCOVERY_JAR_SIZE = 71451L;
-	private static long JAVAX_XML_RPC_JAR_SIZE = 32361L;
-	private static long JAVAX_XML_SOAP_JAR_SIZE = 19582L;
-	private static long JAVAX_WSDL_JAR_SIZE = 134085L;
-	private static long COMMON_LOGGING_JAR_SIZE = 39353L;
-
-// Web Services Jars Used in previous Versions of WTP but now obsolete
-	private static String[] OBSOLETE_JARS = new String[]{"commons-discovery.jar", "commons-logging-1.0.4.jar", "log4j-1.2.4.jar", "log4j-1.2.8.jar", "wsdl4j-1.5.1.jar", "axis-ant.jar"};
-
-	public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
-	private IProject project;
-	private Boolean projectRestartRequired_ = Boolean.FALSE;
-	private IClasspathEntry[] oldClasspath;
-	private ArrayList newJarNamesList = new ArrayList();
-
-	/**
-	 * 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 = J2EEUtils.getWebContentPath(project);
-		if (webModulePath == null) {
-			status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND);
-			env.getStatusHandler().reportError(status);
-			return;
-		}
-
-		deleteObsoleteJars(webModulePath);
-
-
-		copyIFile(AXIS_RUNTIME_PLUGIN_ID, "lib/" + AXIS_JAR, webModulePath, "WEB-INF/lib/" + AXIS_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-		copyIFile(COMMON_DISCOVERY_PLUGIN_ID, "lib/" + COMMON_DISCOVERY_JAR, webModulePath, "WEB-INF/lib/" + COMMON_DISCOVERY_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-		copyIFile(JAVAX_XML_RPC_PLUGIN_ID, "lib/" + JAVAX_XML_RPC_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_RPC_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-		copyIFile(JAVAX_XML_SOAP_PLUGIN_ID, "lib/" + JAVAX_XML_SOAP_JAR, webModulePath, "WEB-INF/lib/" + JAVAX_XML_SOAP_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-		copyPluginJar(JAVAX_WSDL_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + JAVAX_WSDL_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-
-		copyPluginJar(COMMON_LOGGING_PLUGIN_ID, webModulePath, "WEB-INF/lib/" + COMMON_LOGGING_JAR, status, env, monitor);
-		if (status.getSeverity() == Status.ERROR) {
-			return;
-		}
-		return;
-	}
-
-	/**
-	 * 
-	 */
-	private void copyIFile(String pluginId, 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(pluginId, 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);
-
-		}
-	}
-
-	/**
-	 * Copy plugins that has been JARed
-	 */
-	private void copyPluginJar(String pluginId, 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);
-
-			File jarFile = FileLocator.getBundleFile(Platform.getBundle(pluginId));
-			if (jarFile != null && jarFile.isFile()) {
-				IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-
-				if (!resource.exists()) {
-					InputStream is = new FileInputStream(jarFile);
-					IFile file = FileResourceUtils.createFile(context, target, is, 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);
-
-		}
-	}
-
-	/*
-	 * Check for any obsolete Jars in WEB-INF/lib folder Obsolete jars would
-	 * be found in projects migrated from older versions of WTP
-	 */
-	private void deleteObsoleteJars(IPath webModulePath) {
-		// First check for Any jars that have names that are known to be
-		// obsolete
-		for (int i = 0; i < OBSOLETE_JARS.length; i++) {
-			IPath path = webModulePath.append("WEB-INF/lib/" + OBSOLETE_JARS[i]);
-
-			IFile resource = ResourceUtils.getWorkspaceRoot().getFile(path);
-			if (resource.exists()) {
-				deleteResource(resource);
-			}
-		}
-
-		// delete older JARs of the same name
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + AXIS_JAR), AXIS_JAR_SIZE);
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_DISCOVERY_JAR), COMMON_DISCOVERY_JAR_SIZE);
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_RPC_JAR), JAVAX_XML_RPC_JAR_SIZE);
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_XML_SOAP_JAR), JAVAX_XML_SOAP_JAR_SIZE);
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + JAVAX_WSDL_JAR), JAVAX_WSDL_JAR_SIZE);
-		deleteOldJar(webModulePath.append("WEB-INF/lib/" + COMMON_LOGGING_JAR), COMMON_LOGGING_JAR_SIZE);
-
-	}
-
-	private void deleteOldJar(IPath jarPath, long jarSize) {
-		IFile resource = ResourceUtils.getWorkspaceRoot().getFile(jarPath);
-		if (resource.exists()) {
-			// calculate the size of the resource by getting the java.io.File
-			long fileSize = resource.getLocation().toFile().length();
-			if (fileSize != jarSize) {
-				deleteResource(resource);
-			}
-		}
-	}
-
-	private void deleteResource(IFile resource) { // delete the resource
-		try {
-			// System.out.println("Obsolete Jar!! " + resource.getName());
-			resource.delete(true, null);
-		}
-		catch (Exception e) { // e.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * Addes Axis JARs to the build path of Java project
-	 * 
-	 * @param env
-	 * @param monitor
-	 * @return
-	 */
-	public IStatus addAxisJarsToBuildPath(IProject project, IEnvironment env, IProgressMonitor monitor) {
-
-		IStatus status;
-
-		try {
-			getJavaProjectClasspath(env, monitor);
-
-			addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + AXIS_JAR, getTheJarPath(AXIS_RUNTIME_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + AXIS_JAR));
-			addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR, getTheJarPath(COMMON_DISCOVERY_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + COMMON_DISCOVERY_JAR));
-			addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR, getTheJarPath(JAVAX_XML_RPC_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_RPC_JAR));
-			addNewJarEntry(PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR, getTheJarPath(JAVAX_XML_SOAP_PLUGIN_ID, PATH_TO_JARS_IN_PLUGIN + JAVAX_XML_SOAP_JAR));
-
-			IPath javaxWsdlJarPath = BundleUtils.getJarredPluginPath(JAVAX_WSDL_PLUGIN_ID);
-			if (javaxWsdlJarPath != null) {
-				addNewJarEntry(javaxWsdlJarPath.toString(), javaxWsdlJarPath);
-			}
-			
-			IPath commonLoggingJarPath = BundleUtils.getJarredPluginPath(COMMON_LOGGING_PLUGIN_ID);
-			if (commonLoggingJarPath != null) {
-				addNewJarEntry(commonLoggingJarPath.toString(), commonLoggingJarPath);
-			}
-			updateClasspath(monitor);
-		}
-		catch (Exception e) {
-			status = StatusUtils.errorStatus(AxisConsumptionUIMessages.MSG_ERROR_BAD_BUILDPATH, e);
-			return status;
-		}
-
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * @param env
-	 * @param monitor
-	 * @return The Java project classpath
-	 * @throws JavaModelException
-	 */
-	private IStatus getJavaProjectClasspath(IEnvironment env, IProgressMonitor monitor) throws JavaModelException {
-
-		IStatus status = Status.OK_STATUS;
-
-		IJavaProject javaProject_ = null;
-		oldClasspath = null;
-		javaProject_ = JavaCore.create(project);
-
-		oldClasspath = javaProject_.getRawClasspath();
-
-		return status;
-	}
-
-	/**
-	 * Store new JAR name in newJarNamesList if it's not already on build path
-	 * 
-	 * @param jarName
-	 *            name of the JAR
-	 * @param jarPath
-	 *            Absolute path to the JAR
-	 */
-	private void addNewJarEntry(String jarName, IPath jarPath) {
-
-		boolean found = false;
-		for (int i = 0; i < oldClasspath.length; i++) {
-			found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
-			if (found) {
-				break;
-			}
-		}
-
-		if (!found) {
-			newJarNamesList.add(new JarEntry(jarName, jarPath));
-		}
-
-	}
-
-	/**
-	 * Update the Java project classpath adding classpath from newJarNamesList
-	 * to oldClasspath
-	 * 
-	 * @param monitor
-	 * @return
-	 * @throws JavaModelException
-	 */
-	private IStatus updateClasspath(IProgressMonitor monitor) throws JavaModelException {
-
-		IStatus status = Status.OK_STATUS;
-
-		if (newJarNamesList.size() > 0) {
-			JarEntry[] newJarEntries = (JarEntry[]) newJarNamesList.toArray(new JarEntry[]{});
-
-			IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarEntries.length];
-			int i = 0;
-			// Add oldClasspath entries
-			while (i < oldClasspath.length) {
-				newClasspath[i] = oldClasspath[i];
-				i++;
-			}
-
-			int m = 0;
-			while (i < newClasspath.length) {
-				newClasspath[i] = JavaCore.newLibraryEntry(newJarEntries[m].getJarPath(), null, null);
-				m++;
-				i++;
-			}
-
-			//
-			// Then update the project classpath.
-			//
-
-			IJavaProject javaProject = JavaCore.create(project);
-			javaProject.setRawClasspath(newClasspath, monitor);
-
-		}
-
-		return status;
-
-	}
-
-	//
-	// Returns the local native pathname of the jar.
-	//
-	private IPath getTheJarPath(String pluginId, String theJar) throws MalformedURLException, IOException {
-		if (pluginId != null) {
-			URL localURL = Platform.asLocalURL(BundleUtils.getURLFromBundle(pluginId, theJar));
-			return new Path(localURL.getFile());
-		}
-		else {
-			return new Path(theJar);
-		}
-
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-
-	public boolean getProjectRestartRequired() {
-		return projectRestartRequired_.booleanValue();
-	}
-
-	public class JarEntry {
-		private String jarName;
-		private IPath jarPath;
-
-		public JarEntry(String name, IPath path) {
-			jarName = name;
-			jarPath = path;
-		}
-
-		public String getJarName() {
-			return jarName;
-		}
-
-		public IPath getJarPath() {
-			return jarPath;
-		}
-
-	}
-}
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 cfd7895..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,130 +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.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 650b520..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,63 +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.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 b94021c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060503   126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060515   118315 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- *******************************************************************************/
-
-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.Operation;
-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.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.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;
-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 String outputFolder_;
-  private String proxyEndpoint_;
-  
-  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    
-		if (!ResourceUtils.isJavaProject(clientProject_))
-		{
-	 		   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)
-        {
-          proxyEndpoint_ = soapAddress.getLocationURI();
-          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_);
-            stub2BeanInfo.setOutputFolder( outputFolder_ );
-            String portTypePkgName = NameMappingUtils.getPackageName(portType.getQName().getNamespaceURI(), pkg2nsMapping);
-            
-            /*
-             * If the package name and method name are the same the Axis
-             * wsdl2Java Emitter adds a "_pkg" suffix to the package name
-             * of generated code.
-             * 
-             * We need to make sure the proxy get's put in this same package
-             * if an operation name is the same as the package name.
-             * (Mark Hutchinson - Bug 118315)
-             */
-            List operations = portType.getOperations();
-            Iterator operIter = operations.iterator();
-            boolean addSuffix = false;
-            while (operIter.hasNext())
-            {
-            	Operation operation = (Operation)operIter.next();
-            	if (operation.getName().equals(portTypePkgName))
-            	{
-            		addSuffix = true;            	
-            	}
-            }            
-            if (addSuffix) {
-            	portTypePkgName = portTypePkgName + "_pkg";
-            	servicePkgName = servicePkgName + "_pkg";
-            }            
-            
-            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(environment, monitor);
-              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_;
-	}	
-	
-	public void setOutputFolder( String outputFolder )
-	{
-		outputFolder_ = outputFolder;
-	}
-
-	public String getProxyEndpoint() {
-		return proxyEndpoint_;
-	}
-}
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 c204eac..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,646 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20060517   141481 pmoogk@ca.ibm.com - Peter Moogk
- * 20070313   176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20080709   240225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-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.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import com.ibm.icu.util.StringTokenizer;
-
-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_;
-  private String   outputFolder_;
-  
-  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 setOutputFolder( String outputFolder )
-  {
-  	outputFolder_ = outputFolder;
-  }
-  
-  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(IEnvironment env, IProgressMonitor progressMonitor) throws CoreException, IOException
-  {
-	IStatusHandler statusMonitor = env.getStatusHandler();
-	
-    IPath        outputPath = new Path( outputFolder_ );
-    IProject     project    = ResourceUtils.getProjectOf( outputPath );
-    StringWriter sw         = new StringWriter(2048);
-    
-    writePackage(sw);
-    writeImports(sw);
-    writeClass(sw);
-    sw.close();
-    byte[] bytes = sw.getBuffer().toString().getBytes( project.getDefaultCharset() );
-    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 newFilePath = new Path(outputFolder_).append( sb.toString() );
-    
-    FileResourceUtils.createFile(((BaseEclipseEnvironment) env).getResourceContext(), newFilePath, 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);
-    
-    newLine(w);
-    w.write("public ");
-    w.write(class_);
-    w.write("(String endpoint) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_endpoint = endpoint;");
-    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();
-    boolean buildProjectCalled = false;
-    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) { // build the project if build project has not been called yet and try again
-    	  if (!buildProjectCalled) {
-      		clientProject_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-      		buildProjectCalled = true;
-      		javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
-      	}
-      }
-      if (javaClass != null)
-      {
-        List methods = javaClass.getMethods();
-        if (methods.isEmpty()) {
-        	if (!buildProjectCalled) { // build the project if build project has not been called yet and try again
-        		clientProject_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-        		buildProjectCalled = true;
-        		javaClass = JavaMOFUtils.getJavaClass(getPackageName(sei), getClassName(sei), clientProject_);
-        		if (javaClass != null)
-        			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 01cb999..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,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 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 f794c78..0000000
--- 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 16dbb8a..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 2af0e3b..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 3cb3670..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,514 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.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;
-import com.ibm.icu.text.Collator;
-import com.ibm.icu.util.StringTokenizer;
-
-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 c3d34c3..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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;
-  }      
-}
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 bad11ef..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080616   235648 makandre@ca.ibm.com - Andrew Mak, Errors in client proxy if using default namespace to package mapping
- * 20080917   247561 mahutch@ca.ibm.com - Mark Hutchinson, Error if whitespace entered in mapping page
- *******************************************************************************/
-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 = "custom.javapackage";
-  private final String DEFAULT_NAMESPACE = "http://custom.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).trim(),pairs[i].getText(1).trim());
-  	  }
-  	  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 bc08bf1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,140 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.AxisConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-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 Combo outputFolderCombo_;
-  /*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 );
-    
-    outputFolderCombo_ = uiUtils.createCombo( textGroup, AxisConsumptionUIMessages.LABEL_FOLDER_NAME,
-    									AxisConsumptionUIMessages.TOOLTIP_PWJB_TEXT_FOLDER,
-    									INFOPOP_PWJB_TEXT_FOLDER,
-    									SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    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();
-    
-    outputFolderCombo_.setEnabled( enabled );
-    showMappingsCheckbox_.setEnabled( enabled );
-  }
-  
-  public void setClientProject(IProject clientProject)
-  {  	
-    IPath[] paths = ResourceUtils.getAllJavaSourceLocations(clientProject);
-    
-    for (int i = 0; i < paths.length ; i++)
-    {
-      outputFolderCombo_.add(paths[i].toString());
-    }
-    
-    if( paths.length > 0 )
-    {
-    	outputFolderCombo_.select(0);
-    }
-  }
-  
-  public String getOutputFolder()
-  {
-  	return outputFolderCombo_.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 bd851ad..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,119 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060523   143284 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-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.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-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, "ClientProject", AxisProxyWidget.class );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    
-    // AxisProxyWidget
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
-    dataRegistry.addMapping( AxisProxyWidget.class, "OutputFolder", DefaultsForClientJavaWSDLCommand.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", ClientCodeGenOperation.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 cdb7e9f..0000000
--- 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 e645096..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,159 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   115144 pmoogk@ca.ibm.com - Peter Moogk
- * 20060509   125094 sengpl@ca.ibm.com - Seng Phung-Lu, Use WorkspaceModifyOperation
- * 20060515   115225 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-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.ClientCodeGenOperation;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-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 ClientCodeGenOperation());
-		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", ClientCodeGenOperation.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", ClientCodeGenOperation.class, "WsdlURI", null);
-
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", ClientCodeGenOperation.class, "Project", null);		
-		
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ClientCodeGenOperation.class);
-		registry.addMapping(DefaultsForClientJavaWSDLCommand.class, "OutputFolder", ClientCodeGenOperation.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(ClientCodeGenOperation.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
-		registry.addMapping(ClientCodeGenOperation.class, "ProxyEndpoint", AxisClientOutputCommand.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-}
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 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 29c079c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
-@dot
-src.zip
-javaCompiler...args
-org.eclipse.jst.ws.consumption.ui_*.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index e102604..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption.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.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 2f402ee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Mon Nov 19 13:59:56 EST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-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=error
-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.5
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 e53eddf..0000000
--- 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 b64a8d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,78 +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.1.7.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;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.ant;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.command;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.command.data;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.extension;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.selection;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.server;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wizard;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wsil;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt;x-internal:=true
-Require-Bundle: org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.webservice.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.wsdl.validation;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
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 ffb8cb2..0000000
--- 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/client_assemble.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_assemble.jpg
deleted file mode 100644
index e676679..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_assemble.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg
deleted file mode 100644
index 7cfc866..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_deploy.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg
deleted file mode 100644
index d659e24..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_develop.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg
deleted file mode 100644
index 0822508..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_install.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg
deleted file mode 100644
index 91c8fa9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_none.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg
deleted file mode 100644
index 363ac70..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_run.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg
deleted file mode 100644
index 36b9445..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/client_test.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d396..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png
deleted file mode 100644
index 8b1189b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/config_handler_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png
deleted file mode 100644
index 0ebafc9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/gen_sample_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png
deleted file mode 100644
index a69bdb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import-wsil_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png
deleted file mode 100644
index ac78ee6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/import_ws_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png
deleted file mode 100644
index 7d2335b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe84..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
deleted file mode 100644
index 4da5ca0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale0_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
deleted file mode 100644
index df1207d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale1_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
deleted file mode 100644
index 9741fde..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale2_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
deleted file mode 100644
index 35d4e22..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale3_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
deleted file mode 100644
index 82bbd5c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale4_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
deleted file mode 100644
index b0806f7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale5_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg b/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
deleted file mode 100644
index 818bcff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/scale6_bground.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index e880705..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,125 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-# -------- -------- -----------------------------------------------------------
-# 20060515   141536 pmoogk@ca.ibm.com - Peter Moogk
-# 20070820   191585 pmoogk@ca.ibm.com - Peter Moogk
-# 20070917   202303 pmoogk@ca.ibm.com - Peter Moogk
-# 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-WEBSERVICES_CATEGORY=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 JAX-RPC 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
-
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-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
-
-#
-# Web service client implementation type
-#
-JAVA_PROXY=Java Proxy
-#
-# 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 fb4161d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,763 +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_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.png"
-            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/full/wizban/gen_sample_wiz.png"
-            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/full/wizban/config_handler_wiz.png"
-            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/full/wizban/config_handler_wiz.png"
-            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/full/wizban/config_handler_wiz.png"
-            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">
-      <category
-             id="org.eclipse.jst.ws.consumption.ui.wsimport.category"
-             name="%WEBSERVICES_CATEGORY"/>
-   </extension>
-      
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            icon="icons/import_ws.gif"
-            category="org.eclipse.jst.ws.consumption.ui.wsimport.category"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.consumption.ui.wsimport">
-         <description>
-               %PLUGIN_IMPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/import_ws_wiz.png"
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
-            id="org.eclipse.jst.ws.consumption.ui.wsimport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            icon="icons/wsil/import_wsil.gif"
-            category="org.eclipse.jst.ws.consumption.ui.wsimport.category"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.consumption.ui.wsilimport">
-         <description>
-               %IMPORT_WIZARD_DESC_WSIL
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/import-wsil_wiz.png"
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
-            id="org.eclipse.jst.ws.consumption.ui.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.TestFacilityDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.TestFacilityDefaultsPreferencePage">
-      </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>
-
-
-   <!-- "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"
-            objectids="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsil org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.service org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl.resource org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.serviceref"
-            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"
-            objectids="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.file org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard.java"
-            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.wst.ws.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.consumption.ui.wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard.wsdl">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.wsil">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.file">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.java">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.service">
-         <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.service">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.consumption.ui.wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="webservices.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor.file">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.service"
-            adaptable="true">
-         <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.navGroup">
-         <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.wsdlRes">
-         <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.xmlfile">
-         <action
-               label="%POPUP_CONFIG_CLIENT_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.ejbfile">
-         <action
-               label="%POPUP_CONFIG_CLIENT_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.webfile">
-         <action
-               label="%POPUP_CONFIG_CLIENT_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.appfile">
-         <action
-               label="%POPUP_CONFIG_CLIENT_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.serviceref"
-            adaptable="true">
-         <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.wsdl.resource">
-         <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.serviceref">
-         <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.wsdl.resource">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.consumption.ui.wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-         objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-         nameFilter="*"
-         id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil.serviceref">
-         <action
-            label="%POPUP_GENERATE_WSIL"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-            menubarPath="additions"
-            id="org.eclipse.jst.ws.consumption.ui.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.JavaBeanSelectionLaunchable"
-            external_modify="true"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-            external_modify="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            external_modify="true"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer">
-      </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"
-    testJavaProxy="yes"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="true"
-    codeGenerated="true"
-    serverRequired="true"
-    isdefaultjaxrpc="true"
-    allowClientRuntimesRestriction="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"
-    testJavaProxy="no"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="false"
-    codeGenerated="false"
-    serverRequired="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"
-            mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
-  </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"
-              required="true"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand"
-              property="InitialSelection"
-              required="true"
-              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="ClientProjectName"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand"
-              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 ee40db4..0000000
--- 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 752d429..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,129 +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>
-         <attribute name="external_modify" type="boolean" use="default" value="false">
-            <annotation>
-               <documentation>
-                  This attribute specifies whether the object selection can be specified outside the object selection widget.  An example, of this would be on page one of the web service widget by typing in a text field.  If set to true, the extender of ObjectSelectionWidget must provide a validate(String) implementation that does any necessary validation and sets the object selection on the widget.  The default value of this attribute is false.  Any text fields will be set to READ_ONLY style so the object selection can only be modified with object selection widget implementation directly.
-               </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 53bdd3c..0000000
--- 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 cbdd711..0000000
--- 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 20bf630..0000000
--- 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 deff7ec..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUI.properties
+++ /dev/null
@@ -1,657 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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     
-# 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060321   128827 joan - Joan Haggarty
-# 20060329   128069 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060407   135443 joan@ca.ibm.com - Joan Haggarty
-# 20060411   136134 kathy@ca.ibm.com - Kathy Chan
-# 20060417   136390 joan@ca.ibm.com - Joan Haggarty
-# 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060418   136335 joan@ca.ibm.com - Joan Haggarty
-# 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060420   120714 kathy@ca.ibm.com - Kathy Chan
-# 20060420   135912 joan@ca.ibm.com - Joan Haggarty
-# 20060510   141115 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060509   119296 pmoogk@ca.ibm.com - Peter Moogk
-# 20060602   145054 kathy@ca.ibm.com - Kathy Chan
-# 20070427   177360 pmoogk@ca.ibm.com - Peter Moogk
-# 20071031   140518 joan@ca.ibm.com - Joan Haggarty
-# 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
-# 20080326   171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
-# 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
-# 20080331   225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
-# 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
-# 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
-###############################################################################
-
-#
-# 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 > Runtime Environments and configure a server runtime.
-MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED={0} is not installed. Go to Window > Preferences. Select Server > Runtime Environments and configure a server runtime.
-
-
-#
-# 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_WEBSERVICEIMPL=Service implementation:
-LABEL_WEBSERVICEDEF=Service definition:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=B&rowse...
-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_SERVICE=Select a service implementation or definition and move the sliders to set the level of service and client generation.
-PAGE_DESC_WS_CLIENT=Select a service definition and move the slider to set the level of client generation.
-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 type:
-
-TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK=Click on the link to edit service project and EAR settings.
-TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK=Click on the link to edit client project and EAR settings.
-
-DIALOG_TITILE_SERVICE_IMPL_SELECTION=Select Service Implementation
-DIALOG_TITILE_SERVICE_DEF_SELECTION=Select Service Definition
-DIALOG_TITILE_SERVICE_PROJECT_SETTINGS=Specify Service Project Settings
-DIALOG_TITILE_CLIENT_PROJECT_SETTINGS=Specify Client Project Settings
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-LABEL_SUMMARY=Configuration:
-LABEL_SUMMARY_NO_CLIENT=Configuration: No client generation.
-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_SERVERS_INSTANCES=Server instance:
-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=Click on the link to specify the web service runtime.
-TOOLTIP_PWRS_TEXT_SERVER=Click on the link to specify a server.
-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_NO_OBJECT_SELECTION=Select a service implementation.
-MSG_NO_SERVICE_SELECTION=Select a service definition.
-MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION=The service implementation selected does not follow Java naming conventions.
-MSG_INVALID_SERVICE_IMPL=The service implementation selected is invalid.
-MSG_INVALID_SERVICE_DEF=The service definition selected is invalid.
-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_WARN_NO_SERVICE_SERVER=No server has been selected. The Web service will not be deployed, installed, or run.
-MSG_WARN_NO_CLIENT_SERVER=No server has been selected. The Web service client will not be deployed, installed, or run.
-
-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_PROJECT_TYPE_EMPTY=Select a service project type.
-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_PROJECT_TYPE_EMPTY=Select a client project type.
-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_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT=The {0} server does not support the Java 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.
-
-MSG_PROJECT_MUST_EXIST=No server can be found and {0} does not exist. Choose an existing project or use the preferences to configure a server runtime.  
-
-
-# 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=Test Web Service
-PAGE_DESC_WSTEST=Select a test facility
-CHECKBOX_TEST_WEBSERVICE=&Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=&Monitor the Web service
-CHECKBOX_OVERWRITE_FILES=&Overwrite files without warning
-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.
-MSG_ERROR_MODULE_DEPENDENCY=Unable to establish module dependency from {0} to {1}.
-
-#
-# 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.
-LABEL_SHOW_ALL_STATELESS_SESSION_EJBS=<<Show all stateless session EJBs>>
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for Web Service Wizard Scenario Page
-#
-BUTTON_WSWSCEN_PUBLISH=&Publish the Web service
-TOOLTIP_WSWSCEN_SCALE_DEVELOP=Develop
-TOOLTIP_WSWSCEN_SCALE_ASSEMBLE=Assemble
-TOOLTIP_WSWSCEN_SCALE_DEPLOY=Deploy
-TOOLTIP_WSWSCEN_SCALE_INSTALL=Install
-TOOLTIP_WSWSCEN_SCALE_RUN=Start
-TOOLTIP_WSWSCEN_SCALE_TEST=Test
-TOOLTIP_WSWSCEN_SCALE_SERVICE=Move the slider to set the level of service generation.
-TOOLTIP_WSWSCEN_SCALE_CLIENT=Move the slider to set the level of client generation. Service must be started to enable client generation.
-TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY=Move the slider to set the level of client generation. 
-TOOLTIP_WSWSCEN_TEXT_IMPL=Implementation for the web service.
-TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL=Browse implementation files for specified service type.
-TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES=Existing files will be overwritten with no warning during generation.
-
-#
-# 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 traffic 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 a URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exist.
-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 a 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 a 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.
-
-#
-# Table column heading for ValidationMessageViewerWidget
-#
-TABLE_COLUMN_VALIDATION_SEVERITY=Severity
-TABLE_COLUMN_VALIDATION_LINE=Line
-TABLE_COLUMN_VALIDATION_COLUMN=Column
-TABLE_COLUMN_VALIDATION_MESSAGE=Message
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_COMBOBOX_SERVER=Select the server type.
-TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE=Select the server instance.
-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 References:
-LABEL_COMBO_WS_SERVICE_DESC=Service Descriptions:
-MSG_TEXT_NUM_OF_SERVICES=You have selected {0} services.
-MSG_TEXT_NUM_OF_CLIENTS=You have selected {0} client services.
- 
-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
-PAGE_DESC_MULTIPLE_SERVICES_CONFIG=Add handlers to multiple Web services.
-PAGE_DESC_MULTIPLE_CLIENTS_CONFIG=Add handlers to multiple Web service clients.
- 
-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.
-MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT=Invalid multiple selection of Services.  Ensure all selections are Services.#
-
-# 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
-
-#
-# 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.
-
-LABEL_BUTTON_STOP_WSDL_VALIDATION=Stop Validation
-TOOLTIP_STOP_VALIDATION_BUTTON=Stops the current WSDL validation operation.
-
-
-#
-# Start server page
-#
-PAGE_TITLE_WS_START_SERVER=Server startup
-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
-
-#
-# Warnings
-#
-
-MSG_SERVER_NOT_FOUND_WARNING=A suitable server was not found. The sample can be generated but cannot be launched.
-
-
-#
-# 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}
-
-MSG_INFO_WSDL_OPERATION_TIMED_OUT=Could not retrieve the WSDL file {0}.  Do you want to continue to wait for this file?
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 6c91e82..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ConsumptionUIMessages.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060221 119111   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060329 128069   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu 
- * 20060411   136134 kathy@ca.ibm.com - Kathy Chan
- * 20060417   136390/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418   136335 joan@ca.ibm.com - Joan Haggarty
- * 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   120714 kathy@ca.ibm.com - Kathy Chan
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- * 20060426   138647 joan@ca.ibm.com - Joan Haggarty
- * 20060510   141115 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060509   119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060719   139977 kathy@ca.ibm.com - Kathy Chan
- * 20071031   140518 joan@ca.ibm.com - Joan Haggarty
- * 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- * 20080326   171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-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 MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED;
-	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_WEBSERVICEIMPL;
-	public static String LABEL_WEBSERVICEDEF;
-	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_SERVICE;
-	public static String PAGE_DESC_WS_CLIENT;
-	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_SUMMARY;
-	public static String LABEL_SUMMARY_NO_CLIENT;
-	public static String LABEL_RUNTIMES_LIST;
-	public static String LABEL_SERVERS_LIST;
-	public static String LABEL_SERVERS_INSTANCES;
-	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_NO_OBJECT_SELECTION;
-	public static String MSG_NO_SERVICE_SELECTION;
-	public static String MSG_INVALID_SERVICE_DEF;
-	public static String MSG_INVALID_SERVICE_IMPL;
-	public static String MSG_INVALID_SRT_SELECTIONS;
-	public static String MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION;
-	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_WARN_NO_SERVICE_SERVER;
-    public static String MSG_WARN_NO_CLIENT_SERVER;
-	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_PROJECT_TYPE_EMPTY;
-	public static String MSG_SERVICE_EAR_EMPTY;
-	public static String MSG_CLIENT_PROJECT_EMPTY;
-	public static String MSG_CLIENT_PROJECT_TYPE_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_JAVAPROJECT;
-    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_WSWSCEN_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 LABEL_SHOW_ALL_STATELESS_SESSION_EJBS;
-	public static String CHECKBOX_OVERWRITE_FILES;
-	public static String DIALOG_TITILE_SERVICE_PROJECT_SETTINGS;
-	public static String DIALOG_TITILE_CLIENT_PROJECT_SETTINGS;
-	public static String DIALOG_TITILE_SERVICE_IMPL_SELECTION;
-	public static String DIALOG_TITILE_SERVICE_DEF_SELECTION;
-	public static String TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK;
-	public static String TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK;
-	public static String TOOLTIP_WSWSCEN_SCALE_DEVELOP;
-	public static String TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
-	public static String TOOLTIP_WSWSCEN_SCALE_DEPLOY;
-	public static String TOOLTIP_WSWSCEN_SCALE_INSTALL;
-	public static String TOOLTIP_WSWSCEN_SCALE_RUN;
-	public static String TOOLTIP_WSWSCEN_SCALE_TEST;
-	public static String TOOLTIP_WSWSCEN_SCALE_SERVICE;
-	public static String TOOLTIP_WSWSCEN_SCALE_CLIENT;
-	public static String TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY;
-	public static String TOOLTIP_WSWSCEN_TEXT_IMPL;
-	public static String TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES;
-	public static String TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL;
-	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 TABLE_COLUMN_VALIDATION_SEVERITY;
-	public static String TABLE_COLUMN_VALIDATION_LINE;
-	public static String TABLE_COLUMN_VALIDATION_COLUMN;
-	public static String TABLE_COLUMN_VALIDATION_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_COMBOBOX_SERVER;
-	public static String TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE;
-	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 MSG_TEXT_NUM_OF_SERVICES;
-    public static String MSG_TEXT_NUM_OF_CLIENTS;
-	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 PAGE_DESC_MULTIPLE_SERVICES_CONFIG;
-    public static String PAGE_DESC_MULTIPLE_CLIENTS_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 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 LABEL_BUTTON_STOP_WSDL_VALIDATION;
-	public static String TOOLTIP_STOP_VALIDATION_BUTTON;
-	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;
-    public static String MSG_PROJECT_MUST_EXIST;
-    public static String MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
-    public static String MSG_ERROR_MODULE_DEPENDENCY;
-    public static String MSG_INFO_WSDL_OPERATION_TIMED_OUT;
-    public static String MSG_SERVER_NOT_FOUND_WARNING;
-
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ConsumptionUIMessages.class);
-	}
-}
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 14e0d37..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/ant/AntClientRootCommandFragment.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530   144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530   144350 kathy@ca.ibm.com - Kathy Chan
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011   159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070501   178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.ant;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntRestoringCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntWorkspaceSaveCommand;
-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.common.ScenarioCleanupCommand;
-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.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(true), "" ) );
-  add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-  add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-  
-  add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
-  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 AntRestoringCommand(), "" ));
-  add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-  add( new SimpleFragment( new AntWorkspaceSaveCommand(), ""));
- 
-  }
-  
-  /* (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);
-      
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.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);
-      
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DeployClient", 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);        
-      dataRegistry.addMapping(AntDefaultingOperation.class, "DeployClient", 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( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", PreClientDevelopCommand.class, "StartService", null);      
-	  
-      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 );  
-          
-      dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class);          
-   }        
-}
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 3fbf57b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntDefaultingOperation.java
+++ /dev/null
@@ -1,79 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20061011   159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- *******************************************************************************/
-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;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-public class AntDefaultingOperation extends AbstractDataModelOperation{
-
-	private boolean rendererValidation;
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		// TODO Auto-generated method stub
-
-		rendererValidation = RendererFactory.getDefaultRendererFactory().isValidating();		
-		RendererFactory.getDefaultRendererFactory().setValidating(false);
-		
-		return Status.OK_STATUS;
-	}
-	
-	public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		
-		RendererFactory.getDefaultRendererFactory().setValidating(rendererValidation);
-		
-		return Status.OK_STATUS;
-	}
-	
-	public boolean getServiceIdsFixed()
-	{
-		return true;
-	}
-
-	public boolean getClientIdsFixed()
-	{
-		return true;
-	}
-	
-	public boolean getStartService()
-	{
-		return false;	
-	}
-	
-	public boolean getInstallService()
-	{
-		return false;
-	}
-    
-    public boolean getDeployService()
-    {
-      return true;
-    }
-    
-    public boolean getDeployClient()
-    {
-      return true;
-    }
-    
-    public boolean getRendererValidation()
-    {
-    	return rendererValidation;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java
deleted file mode 100644
index 5c73902..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntRestoringCommand.java
+++ /dev/null
@@ -1,39 +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
- * -------- -------- -----------------------------------------------------------
- * 20061011   159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- *******************************************************************************/
-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;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-public class AntRestoringCommand extends AbstractDataModelOperation{
-
-	private boolean rendererValidation;
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-
-		RendererFactory.getDefaultRendererFactory().setValidating(rendererValidation);
-
-		return Status.OK_STATUS;
-	}
-	
-    public void setRendererValidation(boolean rendererValidation)
-    {
-    	this.rendererValidation = rendererValidation;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java
deleted file mode 100644
index be00099..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/AntWorkspaceSaveCommand.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070501   178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import org.eclipse.core.commands.ExecutionException;
-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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class AntWorkspaceSaveCommand extends AbstractDataModelOperation {
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		try {
-			// attempt to save the state of the workspace
-			ResourcesPlugin.getWorkspace().save(true, monitor);
-			return Status.OK_STATUS;
-		}
-		catch (CoreException e) {
-			throw new ExecutionException(e.getMessage(), e);
-		}
-	}	
-}
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 b356743..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 9878261..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,304 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404   134913 sengpl@ca.ibm.com - Seng Phung-Lu      
- * 20060517   142027 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-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.Enumeration;
-import java.util.Hashtable;
-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.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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 boolean genSkeleton_;
-  private String handlerNameForEdit_ = null;
-  
-  private HandlerServiceRefHolder[] handlerServiceRefHolder_;
-  private HandlerDescriptionHolder[]handlerDescriptionHolder_;
-  
-  public GenerateHandlerSkeletonCommand()
-  {
-  }
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  
-    IStatus     returnStatus = Status.OK_STATUS;
-  	
-  	if (!genSkeleton_)	return returnStatus; 
-  	
-      // form the map of classname to locations
-      if (handlerDescriptionHolder_!=null){
-        for (int i=0;i<handlerDescriptionHolder_.length;i++){
-          Hashtable handlerTable = new Hashtable();
-          IPath outPath = handlerDescriptionHolder_[i].getSourceOutputPath();
-          List handlers = handlerDescriptionHolder_[i].getHandlerList();
-          for (int j=0;j<handlers.size();j++){
-            HandlerTableItem hti = (HandlerTableItem)handlers.get(j);
-            String className = hti.getHandlerClassName();
-            if (className!=null && outPath!=null)
-              handlerTable.put(className, outPath);
-          }
-          returnStatus = genHandlersClasses(handlerTable, monitor);
-        }
-        
-      }
-      else {
-        for (int i=0;i<handlerServiceRefHolder_.length;i++){
-          Hashtable handlerTable = new Hashtable();
-          IPath outPath = handlerServiceRefHolder_[i].getSourceOutputPath();
-          List handlers = handlerServiceRefHolder_[i].getHandlerList();
-          for (int j=0;j<handlers.size();j++){
-            HandlerTableItem hti = (HandlerTableItem)handlers.get(j);
-            String className = hti.getHandlerClassName();
-            if (className!=null && outPath!=null)
-              handlerTable.put(className, outPath);
-          }
-          returnStatus = genHandlersClasses(handlerTable, monitor);
-        }
-      }
-    
- 
-    return returnStatus;
-
-  }
-  
-  private IStatus genHandlersClasses(Hashtable handlersForGen, IProgressMonitor monitor){
-    IEnvironment env          = getEnvironment();
-    MultiStatus status       = null;
-    IStatus     returnStatus = Status.OK_STATUS;
-    boolean error = false;
-    
-    IStatus writeStatus;    
-    Enumeration keys = handlersForGen.keys();
-    while (keys.hasMoreElements()) {
-        String className = (String)keys.nextElement();
-        writeStatus = writeFile(env, className, (IPath)handlersForGen.get(className), 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;
-        outputLocation_ = outputLocation;
-  	}
-  	
-  	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 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;
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
-    this.handlerServiceRefHolder_ = handlerHolders;
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] handlerHolders){
-    this.handlerDescriptionHolder_ = handlerHolders;
-  }
-  
- 
-}
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 d51a7c2..0000000
--- 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 53bedd5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,110 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- *******************************************************************************/
-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;
-  private boolean isEnabled_ = true;  // is true by default
-
-  public OpenJavaEditorCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    if (isEnabled_) {
-      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;
-  }
-  
-  public void setIsEnabled(boolean isEnabled){
-    this.isEnabled_ = isEnabled;
-  }
-  
-  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 Status.OK_STATUS;
-      }
-      else if (project!=null || classNames.isEmpty()){
-        // do nothing ; nothing to open
-        return Status.OK_STATUS;
-      }
-      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/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 283f011..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/StartServerCommand.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070426   162287 makandre@ca.ibm.com - Andrew Mak, Server publish cancel button unavailable
- * 20080509   165327 kathy@ca.ibm.com - Kathy Chan, Use API from IServer to call shouldPublish and shouldRestart
- *******************************************************************************/
-
-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.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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;
-
-/**
- * (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.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.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_ )
-		{	
-		  ProgressMonitorDialog dialog = new ProgressMonitorDialog(null);
-		  dialog.run(true, true, 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];
-      if (status.getSeverity() == IStatus.CANCEL)
-    	  status = StatusUtils.errorStatus("");
-      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 507cdad..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,87 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420   120714 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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 
-      {
-    	  // Set message to empty string so that an error dialog does
-    	  // not pop-up telling the user that they cannot continue
-    	  // because they choose not to ignore the WS-I non-compliance warning.
-    		return StatusUtils.errorStatus( "" );
-    	}
-    } 
-    else 
-    {
-    	// Set message to empty string so that an error dialog does
-  	  	// not pop-up telling the user that they cannot continue
-  	  	// because they choose not to ignore the WS-I non-compliance warning.
-		  return StatusUtils.errorStatus( "" );
-	}
-  }
-  
-  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 ca35e38..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 ac65f41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060221   124302 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-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)
-  {
-    if (value != null)
-    {
-      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);
-    } else
-    {
-      return null;
-    }
-  }
-}
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 6f881ca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 815d797..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/DefaultingUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
deleted file mode 100644
index a28667f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/DefaultingUtils.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20070723   194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-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.wst.common.componentcore.resources.IVirtualComponent;
-
-public class DefaultingUtils {
-	
-	public DefaultingUtils()
-	{
-			
-	}
-	
-	/**
-	 * 
-	 * Uses the following steps to determine a valid default EAR project name:
-	 *  
-	 * 1. If project does exist:
-	 * 		a - look for an existing, referencing EAR component, if one exists return that EAR name
-	 * 		b - look for an existing EAR component with the same J2EE version as the project
-	 * 2. If can't find an appropriate existing EAR component or project does not exist in the 
-	 *     workspace, return a new EAR name of form projectNameEAR
-	 * 3. If project name is null or an empty string return the default EAR name
-	 * 
-	 * @param projectName a string representing the name of the project for the service
-	 * @return a string to be used as the default EAR project name for the project name provided
-	 */
-	public static String getDefaultEARProjectName(String projectName)
-	{
-
-		if (projectName != null && projectName.length() > 0) {
-			
-			IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-
-			if (proj.exists()) {
-				
-				//Step 1a - return a referencing EAR project
-				IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(proj);
-				if (ears != null && ears.length > 0) {
-					return ears[0].getName();
-				}
-				
-				//Step 1b - return an appropriate existing EAR project
-			    IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();			      
-
-			    if (allEarComps.length > 0)
-			    {			      
-			        for (int i=0; i < allEarComps.length; i++)
-			        {
-			          IProject earProject = allEarComps[i].getProject();
-			          boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(proj, earProject);
-			          if (canAssociate)
-			          {
-			            return allEarComps[i].getName(); 
-			          }
-			        }			      			      
-			    }
-			}
-			
-			
-			String baseEARName = projectName + ResourceUtils.getDefaultEARExtension();
-			String earName = baseEARName;
-
-			boolean foundEAR = false;
-			int i = 1;
-			
-			while (!foundEAR) {
-				// 194434 - Check for non-existing EAR with contents that's not deleted previously
-				IStatus canCreateEARStatus = J2EEUtils.canCreateEAR(ProjectUtilities.getProject(earName));
-				if (canCreateEARStatus.isOK()) {
-					foundEAR = true;
-				} else {
-					earName = baseEARName + i;
-					i++;
-				}
-			}
-			
-			
-			//Step 2 - return project name with EAR on the end
-			return earName;			
-		}
-		
-		//Step 3 - return the default EAR project name
-		return ResourceUtils.getDefaultServiceEARProjectName();		
-	}
-}
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 cd8e709..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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/HandlerDescriptionHelper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHelper.java
deleted file mode 100644
index de63bbb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHelper.java
+++ /dev/null
@@ -1,67 +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
- * 20060404 134913  sengpl@ca.ibm.com - Seng Phung-Lu
- * -------- -------- -----------------------------------------------------------
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-
-public class HandlerDescriptionHelper {
-
-  /**
-   * Helper method for getting the HandlerDescriptorHolder given the name
-   * @param hdhs
-   * @param descName
-   * @return
-   */
-  public static HandlerDescriptionHolder getForDescriptionName(HandlerDescriptionHolder[] hdhs, String descName){
-    for (int i=0;i<hdhs.length;i++){
-      String name = hdhs[i].getDescriptionName();
-      if (name!=null && name.equals(descName)){
-        return hdhs[i];
-      }
-    }
-    return  null;
-  }
-  
-  /**
-   * Helper method for getting all description names
-   * @param hdhs
-   * @return
-   */
-  public static String[] getAllDescriptionNames(HandlerDescriptionHolder[] hdhs){
-    String[] names = new String[hdhs.length];
-    for(int i=0;i<hdhs.length;i++){
-      names[i]=hdhs[i].getDescriptionName();
-    }
-    return names;
-  }
-
-  public static String[] getAllHandlerClassNames(HandlerDescriptionHolder[] hdhs){
-    Vector v = new Vector();
-    for (int i=0;i<hdhs.length;i++){
-      List list = hdhs[i].getHandlerList();
-      if (list!=null && !list.isEmpty()){
-        for (int j=0;j<list.size();j++){
-          HandlerTableItem hti = (HandlerTableItem)list.get(j);
-          v.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])v.toArray(new String[0]);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java
deleted file mode 100644
index 00cbadd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerDescriptionHolder.java
+++ /dev/null
@@ -1,137 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913  sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060518 142554 sengpl@ca.ibm.com  - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerDescriptionHolder {
-  
-  private String descriptionName;
-  private List handlerList;
-  private WebServiceDescription descriptionObject;
-  private IPath sourceOutputPath;
-  
-    
-  public IPath getSourceOutputPath() {
-    return sourceOutputPath;
-  }
-  
-  public void setSourceOutputPath(IPath sourceOutputPath) {
-    this.sourceOutputPath = sourceOutputPath;
-  }
-
-  public IProject getProject(){
-    if (descriptionObject!=null)
-      return ProjectUtilities.getProject(descriptionObject);
-    else
-      return null;
-  }
-  
-  /*
-   * get the WebServiceDescription object 
-   */
-  public WebServiceDescription getDescriptionObject() {
-    return descriptionObject;
-  }
-  
-  /**
-   * set WebServiceDescription object
-   * @param descriptionObject
-   */
-  public void setDescriptionObject(WebServiceDescription descriptionObject) {
-    this.descriptionObject = descriptionObject;
-  }
-
-  /**
-   * get Description name
-   * @return
-   */
-  public String getDescriptionName() {
-    return descriptionName;
-  }
-  
-  /**
-   * set Description name
-   * @param descriptionName
-   */
-  public void setDescriptionName(String descriptionName) {
-    this.descriptionName = descriptionName;
-  }
-  
-  /**
-   * get List of HandlerTableItem associated with this service description
-   * @return
-   */
-  public List getHandlerList() {
-    return handlerList;
-  }
-
-  /**
-   * set List of HandlerTableItem associated with this service description
-   * @param handlerList
-   */
-  public void setHandlerList(List handlerList) {
-    this.handlerList = handlerList;
-  }
-  
-  public void addHandlerToAllPorts(){
-    
-    if (handlerList!=null && !handlerList.isEmpty()){
-      
-      for (int z=0;z<handlerList.size();z++){
-        HandlerTableItem hti = (HandlerTableItem)handlerList.get(z);  
-        if (descriptionObject!=null) {
-          List portComponents = descriptionObject.getPortComponents();
-          for (int x=0;x<portComponents.size();x++){
-            PortComponent wsPort = (PortComponent) portComponents.get(x);
-            List wsHandlers = wsPort.getHandlers();
-            if (wsHandlers!=null){
-              boolean alreadyExists = false;
-              for (int y=0;y<wsHandlers.size();y++){
-                Handler handler = (Handler)wsHandlers.get(y);
-                if (handler.getHandlerClass().equals(hti.getHandlerClassName())){
-                  alreadyExists = true;
-                }
-              }
-          
-              if (!alreadyExists) {
-                //create it and add to the list
-                WsddFactory wsddFactory = new WsddFactoryImpl();
-                Handler newHandler = wsddFactory.createHandler();
-                newHandler.setHandlerName(hti.getHandlerName());
-                newHandler.setHandlerClass(hti.getHandlerClassName());
-                wsHandlers.add(newHandler);
-              }
-            }
-          }
-        }
-      }
-    }
-    
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java
deleted file mode 100644
index 3daff3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHelper.java
+++ /dev/null
@@ -1,72 +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
- * 20060404 134913  sengpl@ca.ibm.com - Seng Phung-Lu 
- * -------- -------- -----------------------------------------------------------
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerServiceRefHelper {
-
-  /**
-   * Helper method for getting the HandlerServiceRefHolder given the name
-   * @param hsrh
-   * @param descName
-   * @return
-   */
-  public static HandlerServiceRefHolder getForServiceRefName(HandlerServiceRefHolder[] hsrh, String descName){
-    for (int i=0;i<hsrh.length;i++){
-      String name = hsrh[i].getServiceRefName();
-      if (name!=null && name.equals(descName)){
-        return hsrh[i];
-      }
-    }
-    return  null;
-  }
-  
-  /**
-   * Gets all the handler Class names associated with each service ref
-   * @param hsrh
-   * @return
-   */
-  public static String[] getAllHandlerClassNames(HandlerServiceRefHolder[] hsrh){
-    Vector v = new Vector();
-    for (int i=0;i<hsrh.length;i++){
-      List list = hsrh[i].getHandlerList();
-      if (list!=null && !list.isEmpty()){
-        for (int j=0;j<list.size();j++){
-          HandlerTableItem hti = (HandlerTableItem)list.get(j);
-          v.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])v.toArray(new String[0]);
-  }
-  
-  /**
-   * Get all the service Ref names
-   * @param hsrh
-   * @return
-   */
-  public static String[] getAllServiceRefNames(HandlerServiceRefHolder[] hsrh){
-    String[] names = new String[hsrh.length];
-    for(int i=0;i<hsrh.length;i++){
-      names[i]=hsrh[i].getServiceRefName();
-    }
-    return names;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java
deleted file mode 100644
index b1b004b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/HandlerServiceRefHolder.java
+++ /dev/null
@@ -1,118 +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
- * -------- -------- -----------------------------------------------------------
- * 20060404   134913sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060517   142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.JavaMOFUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-
-
-public class HandlerServiceRefHolder {
-
-  private String serviceRefName;
-  private List handlerList;
-  private ServiceRef serviceRef;
-  private IPath sourceOutputPath;
-  
-  public IPath getSourceOutputPath() {
-    return sourceOutputPath;
-  }
-  
-  public void setSourceOutputPath(IPath sourceOutputPath) {
-    this.sourceOutputPath = sourceOutputPath;
-  }  
-  
-  public IProject getProject() {
-    if (serviceRef!=null)
-      return ProjectUtilities.getProject(serviceRef);
-    else
-      return null;
-  }
-
-  public List getHandlerList() {
-    return handlerList;
-  }
-  
-  public void setHandlerList(List handlerList) {
-    this.handlerList = handlerList;
-  }
-  
-  public ServiceRef getServiceRef() {
-    return serviceRef;
-  }
-  
-  public void setServiceRef(ServiceRef serviceRef) {
-    this.serviceRef = serviceRef;
-  }
-  
-  public String getServiceRefName() {
-    return serviceRefName;
-  }
-  
-  public void setServiceRefName(String serviceRefName) {
-    this.serviceRefName = serviceRefName;
-  }
-  
-  public void addHandlerToServiceRef(){
-    if (handlerList!=null && !handlerList.isEmpty()){
-      
-      for (int x=0;x<handlerList.size();x++){
-        HandlerTableItem hti = (HandlerTableItem)handlerList.get(x);
-        if (serviceRef!=null){
-          List existingHandlers = serviceRef.getHandlers();
-          boolean alreadyExists = false;
-          for (int i=0;i<existingHandlers.size();i++){
-            Handler handler = (Handler)existingHandlers.get(i);
-            if (handler.getHandlerClass().getJavaName().equals(hti.getHandlerClassName())){
-              alreadyExists = true;
-            }
-          }
-          
-          if (!alreadyExists) {
-            
-            Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
-            Handler newHandler = wsClientFactory.createHandler();
-            newHandler.setHandlerName(hti.getHandlerName());
-            try {
-              IProject project = ProjectUtilities.getProject(serviceRef);
-              if (project!=null) {
-                JavaClass javaClass = JavaMOFUtils.getJavaClass(hti.getHandlerClassName(), project);
-                if (javaClass != null) {
-                  newHandler.setHandlerClass(javaClass);
-                }    
-                existingHandlers.add(newHandler);
-              }
-            }
-            catch(Exception e){
-              e.printStackTrace();
-            }
-          }
-          
-        }
-      
-      }
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java
deleted file mode 100644
index a4a6016..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/LabelsAndIds.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080221 146023 gilberta@ca.ibm.com - Gilbert Andrews 
- * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616   237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619   237797 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.Vector;
-
-public class LabelsAndIds
-{
-  private Vector labels_ = new Vector();
-  private Vector ids_ = new Vector();
-  
-  
-  public void add(String id, String label){
-	  ids_.add(id);
-	  labels_.add(label);
-  }
-  
-  public int size(){
-	  return labels_.size();
-  }
-  
-  public String getId(int index){
-	  if (index < 0 || index + 1 > ids_.size()) return null;
-	  return (String)ids_.get(index);
-  }
-  
-  public void clear(){
-	  labels_.clear();
-	  ids_.clear();
-  }
-  
-  /**
-   * @return Returns the ids_.
-   */
-  public String[] getIds()
-  {
-	  String[] stringArray = new String[ids_.size()]; 
-	  ids_.copyInto(stringArray);
-	  return stringArray;
-  }
-  
-  public String[] getLabels()
-  {
-	  String[] stringArray = new String[ids_.size()]; 
-	  labels_.copyInto(stringArray);
-	  return stringArray;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java
deleted file mode 100644
index a9b44f6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ScenarioCleanupCommand.java
+++ /dev/null
@@ -1,52 +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
- * -------- -------- -----------------------------------------------------------
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.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.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
-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();
-    ObjectSelectionRegistry.getInstance().cleanup();
-	
-	  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();
-    ObjectSelectionRegistry.getInstance().cleanup();
-    
-    return Status.OK_STATUS;
-  }
-}
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 2adfab0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060324   116750 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070119   159458 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-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.ServerCore;
-
-
-public class ServerSelectionUtils
-{
-
-  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();
-    IRuntimeType runtimeType = runtime.getRuntimeType();
-    if (runtimeType != null)
-    {
-    	String runtimeId = runtimeType.getId();
-		for (int i=0; i<servers.length; i++)
-		{
-		  IServer server = (IServer)servers[i];
-		  IRuntimeType runtimeType2 = server.getRuntime().getRuntimeType();
-		  if (runtimeType2 != null)
-		  {
-			  String serverRuntimeId = runtimeType2.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;
-  }
-    
-  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;
-  }
-}
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 42c9ade..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,1067 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060222   115834 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060421   136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060425   137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20060905   156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070119   159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070723   194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- * 20071107   203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
- * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080417   227599 kathy@ca.ibm.com - Kathy Chan
- * 20080717   241283 ericdp@ca.ibm.com - Eric D. Peters, Class version error when invoking sample JSP on Tomcat 5.5 when Java project is Java 6
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090121   261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- *******************************************************************************/
-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.IFile;
-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.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.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-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.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor;
-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.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.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-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.IRuntimeType;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- *
- */
-public class ValidationUtils
-{
-	//Constants to help decide how much validation to do.
-	public static final int VALIDATE_NONE = 0;
-	public static final int VALIDATE_ALL = 1;
-	public static final int VALIDATE_SERVER_RUNTIME_CHANGES = 2;
-	public static final int VALIDATE_PROJECT_CHANGES = 3;
-	public static final int VALIDATE_SCALE_CHANGES = 4;
-
-  /**
-   * 
-   */
-  public ValidationUtils()
-  {
-  }
-  
-  /**
-   * Returns a new validation state based on the current validation state
-   * and the requested validation state. If the requested validation state
-   * does not cover all the validation covered by the current validation
-   * state, VALIDATE_ALL is returned. Otherwise, the requested validation
-   * state is returned.
-   * 
-   * @param currentValidationState the validaton state at the time the caller's requests a change
-   * @param requestedValidationState the validation state being requested by the caller.
-   * @return Returns VALIDATE_ALL if the requested validation state
-   * does not cover all the validation covered by the current validation
-   * state. Returned requestedValidationState otherwise.
-   */
-  public int getNewValidationState(int currentValidationState, int requestedValidationState) {
-		int newValidationState;
-		if (currentValidationState == VALIDATE_NONE
-				|| currentValidationState == requestedValidationState) {
-			newValidationState = requestedValidationState;
-		} else {
-			newValidationState = VALIDATE_ALL;
-		}
-
-		return newValidationState;
-
-	}
-  
-  /**
-   * Returns IStatus resulting from checking for empty fields. Used for validation of page 1 of the
-   * Web service/client wizards.
-   * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
-   * @param typeId Web service type id (isClient=false) or Web service client implementation type id (isClient=true) 
-   * @param serviceImpl String representation of the object selection from page 1
-   * @param runtimeId Web service runtime id
-   * @param serverId server type id
-   * @param projectName name of project
-   * @param needEar boolean <code>true</code> if EAR is required, <code>false</code> if not.
-   * @param earProjectName name of EAR project
-   * @param projectTypeId template id
-   * @param isClient boolean <code>true</code> if the method is being called for client side validation, 
-   * <code>false</code> for service side validation.
-   * @return IStatus with severity IStatus.OK if all mandatory fields are non-null and non-empty. 
-   * IStatus with severity IStatus.ERROR otherwise.
-   */
-  public IStatus checkMissingFieldStatus(int validationState, String typeId, String serviceImpl, String runtimeId, String serverId,
-			String projectName, boolean needEar, String earProjectName, String projectTypeId,
-			boolean isClient)
-  {
-		// Object selection	  
-	  if (validationState==VALIDATE_ALL && !isClient)
-	  {
-		if (serviceImpl.length() == 0) {
-			int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
-			if (scenario == WebServiceScenario.BOTTOMUP)
-			{
-			  return StatusUtils
-					.errorStatus(ConsumptionUIMessages.MSG_NO_OBJECT_SELECTION);
-			}
-			else
-			{
-			  return StatusUtils
-					.errorStatus(ConsumptionUIMessages.MSG_NO_SERVICE_SELECTION);				
-			}
-		}
-	  }
-
-		// Web service runtime
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
-			if (runtimeId == null || runtimeId.length() == 0) {
-				if (isClient) {
-					return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME,
-							new String[] { ConsumptionUIMessages.MSG_CLIENT_SUB }));
-				} else {
-					return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_RUNTIME,
-							new String[] { ConsumptionUIMessages.MSG_SERVICE_SUB }));
-				}
-			}
-		}
-
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_PROJECT_CHANGES) {
-			// Project
-			if (projectName == null || projectName.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[] { "" }));
-				}
-			}
-
-			// Project type (if project does not exist)
-			IProject project = ProjectUtilities.getProject(projectName);
-			if (!project.exists()) {
-				if (projectTypeId == null || projectTypeId.length() == 0) {
-
-					if (isClient) {
-						return StatusUtils
-								.errorStatus(ConsumptionUIMessages.MSG_CLIENT_PROJECT_TYPE_EMPTY);
-					} else {
-						return StatusUtils
-								.errorStatus(ConsumptionUIMessages.MSG_SERVICE_PROJECT_TYPE_EMPTY);
-					}
-				}
-			}
-
-			// Ear (if need ear)
-			if (needEar) {
-				if (earProjectName == null || earProjectName.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[] { "" }));
-					}
-				}
-			}
-		}
-	    
-		// Server (if Web service runtime requires a server or project does not
-		// exist)
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
-				|| validationState == VALIDATE_PROJECT_CHANGES) {
-			if (serverId == null || serverId.length() == 0) {
-				RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
-				if (desc.getServerRequired()) {
-					if (isClient) {
-						StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER,
-								new String[] { ConsumptionUIMessages.MSG_CLIENT_SUB }));
-					} else {
-						StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER,
-								new String[] { ConsumptionUIMessages.MSG_SERVICE_SUB }));
-					}
-				} else {
-					IProject project = ProjectUtilities.getProject(projectName);
-					if (!project.exists()) {
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST,
-								new String[] { projectName }));
-
-					}
-				}
-			}
-		}
-		
-		return Status.OK_STATUS;
-  }
-  
-  /**
-   * Returns IStatus resulting from checking for errors. Used for validation of page 1 of the
-   * Web service/client wizards.
-   * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
-   * @param typeRuntimeServer Web service runtime, type and server 
-   * @param projectName name of project
-   * @param needEar boolean <code>true</code> if EAR is required, <code>false</code> if not.
-   * @param earProjectName name of EAR project
-   * @param projectTypeId template id
-   * @param isClient boolean <code>true</code> if the method is being called for client side validation, 
-   * <code>false</code> for service side validation.
-   * @return IStatus with severity IStatus.OK if no errors are present,
-   * IStatus with severity IStatus.ERROR otherwise.
-   */
-  public IStatus checkErrorStatus(int validationState, TypeRuntimeServer typeRuntimeServer, String projectName, String initialProjectName, boolean needEar, String earProjectName, String projectTypeId,
-			boolean isClient) {
-	
-	  	// Ensure server, Web service runtime, and Web service type are
-		// compatible
-
-		String typeId = typeRuntimeServer.getTypeId();
-		String runtimeId = typeRuntimeServer.getRuntimeId();
-		String serverId = typeRuntimeServer.getServerId();
-		String serverInstanceId = typeRuntimeServer.getServerInstanceId();
-
-		// Labels
-	    String serverLabel = "";
-	    if (serverId != null && serverId.length()>0)
-	    {
-	    	serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-	    }
-		String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-		
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
-	    	if (serverId != null && serverId.length() > 0) {
-				if (isClient) {
-					if (!WebServiceRuntimeExtensionUtils2
-							.isServerClientRuntimeTypeSupported(serverId,
-									runtimeId, typeId)) {
-						return StatusUtils
-								.errorStatus(NLS
-										.bind(
-												ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS,
-												new String[] { serverLabel,
-														runtimeLabel }));
-					}
-				} else {
-					if (!WebServiceRuntimeExtensionUtils2
-							.isServerRuntimeTypeSupported(serverId, runtimeId,
-									typeId)) {
-						return StatusUtils
-								.errorStatus(NLS
-										.bind(
-												ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS,
-												new String[] { serverLabel,
-														runtimeLabel }));
-					}
-				
-					if (initialProjectName != "" && serverId != null && !projectName.equals(initialProjectName) &&
-				    		(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP) &&
-				    		J2EEUtils.isJavaComponent(ProjectUtilities.getProject(initialProjectName))){
-				    		
-				    		if(!doesServerSupportProject(serverId,initialProjectName)){
-				    	    	return StatusUtils.errorStatus(NLS.bind(
-										ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
-										new String[] { serverLabel, initialProjectName }));
-				  		    }
-				    	}
-				}
-			}
-	    	
-		}
-	    
-		// If the project exists, ensure it supports the Web service type, Web
-		// service runtime, and server. If the Ear also exists and the project
-		// and Ear are not already associated, ensure they can be.
-		// If the project does not exist, ensure the project type supports the
-		// Web service type, Web service runtime, and server
-		if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
-				|| validationState == VALIDATE_PROJECT_CHANGES) {
-			ValidationUtils valUtils = new ValidationUtils();
-			IProject project = ProjectUtilities.getProject(projectName);
-			if (project.exists()) {
-
-				if (isClient) {
-					// Check if the runtime supports it.
-					if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportProject(
-							typeId, runtimeId, projectName)) {
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_PROJECT,
-								new String[] { runtimeLabel, projectName }));
-					}
-
-					// Check if the server supports it.
-					if (serverId != null && serverId.length() > 0) {
-						if (!valUtils.doesServerSupportProject(serverId, projectName)) {
-							return StatusUtils.errorStatus(NLS.bind(
-													ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT,
-													new String[] { serverLabel, projectName }));
-						}
-					}
-				} else {
-					// Check if the runtime supports it.
-					if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportProject(
-							typeId, runtimeId, projectName)) {
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_PROJECT,
-								new String[] { runtimeLabel, projectName }));
-					}
-
-					// Check if the server supports it.
-					if (serverId != null && serverId.length() > 0)
-					{
-					  if (!valUtils.doesServerSupportProject(serverId, projectName)) {
-						return 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 = projectTypeId;
-				String templateLabel = FacetUtils.getTemplateLabelById(templateId);
-
-				if (isClient) {
-					// Check if the runtime supports it.
-					if (!WebServiceRuntimeExtensionUtils2.doesClientTypeAndRuntimeSupportTemplate(
-							typeId, runtimeId, templateId)) {
-
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
-								new String[] { runtimeLabel, templateLabel }));
-					}
-
-					// Check if the server supports it.
-					if (serverId != null && serverId.length()>0)
-					{
-					  if (!valUtils.doesServerSupportTemplate(serverId, templateId)) {
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_TEMPLATE,
-								new String[] { serverLabel, templateLabel }));
-					  }
-					}
-
-				    if (WebServiceRuntimeExtensionUtils2.getClientRuntimeId(typeRuntimeServer, projectName, projectTypeId) == "")
-				    {
-				    	return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_CLIENT_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
-								new String[] { runtimeLabel, templateLabel }));
-				    }
-					
-				} else {
-					// Check if the runtime supports it.
-					if (!WebServiceRuntimeExtensionUtils2.doesServiceTypeAndRuntimeSupportTemplate(
-							typeId, runtimeId, templateId)) {
-						return StatusUtils
-								.errorStatus(NLS
-										.bind(
-												ConsumptionUIMessages.MSG_SERVICE_RUNTIME_DOES_NOT_SUPPORT_TEMPLATE,
-												new String[] { runtimeLabel, templateLabel }));
-					}
-
-					// Check if the server supports it.
-					if (serverId != null && serverId.length()>0)
-					{
-					  if (!valUtils.doesServerSupportTemplate(serverId, templateId)) {
-						return StatusUtils.errorStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_TEMPLATE,
-								new String[] { serverLabel, templateLabel }));
-					  }
-					}
-				}
-
-			}						
-			
-		}
-		
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_PROJECT_CHANGES) {
-			// Check if project/EAR association is good.
-			if (needEar) {
-				IProject project = ProjectUtilities.getProject(projectName);
-				IProject ep = ProjectUtilities.getProject(earProjectName);
-				
-				// 194434 - Check for non-existing EAR with contents that's not deleted previously
-				IStatus canCreateEARStatus = J2EEUtils.canCreateEAR(ep);
-				if (!canCreateEARStatus.isOK()) {
-					return canCreateEARStatus;
-				}
-			
-				if (project.exists() && ep.exists()) {
-					if (!J2EEUtils.isComponentAssociated(ep, project)) {
-						boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(project, ep);
-						
-						if (!associateStatus) {
-								return StatusUtils.warningStatus(NLS.bind(
-										EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_,
-										new String[] { projectName, ep.getName(),
-												}));
-						}
-					}
-				}
-			}
-		}		
-	        	
-	    // Defect 203826 - Give extender a way to veto server, project, project type and EAR choices
-	    if (validationState == VALIDATE_ALL || validationState == VALIDATE_SERVER_RUNTIME_CHANGES
-				|| validationState == VALIDATE_PROJECT_CHANGES) {	
-	    	TypeRuntimeServer trs = new TypeRuntimeServer();
-	    	trs.setTypeId(typeId);
-	    	trs.setRuntimeId(runtimeId);
-	    	trs.setServerId(serverId);
-	    	IWebServiceRuntimeChecker runtimeChecker = null;
-	    	if (isClient) {
-	    		String clientRuntimeId = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(trs, projectName, projectTypeId);
-	    		runtimeChecker = WebServiceRuntimeExtensionUtils2.getClientRuntimeChecker(clientRuntimeId);
-	    		
-	    	} else {
-	    		String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(trs, projectName, projectTypeId);
-	    		runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
-	    	}
-	    	if (runtimeChecker != null) {
-	    		return runtimeChecker.checkRuntimeCompatibility(serverId, serverInstanceId, projectName, projectTypeId, earProjectName);
-		    }
-	    }
-	    	    
-		return Status.OK_STATUS;
-
-	}
-  
-  /**
-   * Returns IStatus resulting from checking for warnings. Used for validation of page 1 of the
-   * Web service/client wizards. 
-   * @param validationState one of VALIDATE_NONE, VALIDATE_ALL, VALIDATE_SERVER_RUNTIME_CHANGES, VALIDATE_PROJECT_CHANGES, VALIDATE_SCALE_CHANGES
-   * @param scaleSetting one of <BR/>
-   * ScenarioContext.WS_TEST<BR/>
-   * ScenarioContext.WS_START<BR/>
-   * ScenarioContext.WS_INSTALL<BR/>
-   * ScenarioContext.WS_DEPLOY<BR/>
-   * ScenarioContext.WS_ASSEMBLE<BR/>
-   * ScenarioContext.WS_DEVELOP<BR/>
-   * ScenarioContext.WS_NONE
-   * @param serverId server type id
-   * @param serverId server instance id
-   * @param isClient boolean <code>true</code> if the method is being called for client side validation, 
-   * <code>false</code> for service side validation.
-   * @return IStatus with severity IStatus.OK if no errors are present,
-   * IStatus with severity IStatus.WARNING otherwise.
-   */
-  public IStatus checkWarningStatus(int validationState, int scaleSetting, String serverId,
-			String serverInstanceId, boolean isClient) {
-		// Return a warning if there is no server selection and scale setting is
-		// anything beyond assemble.
-		if (validationState == VALIDATE_ALL || validationState == VALIDATE_SCALE_CHANGES
-				|| validationState == VALIDATE_SERVER_RUNTIME_CHANGES) {
-			if (serverId == null || serverId.length() == 0) {
-				if (scaleSetting < ScenarioContext.WS_ASSEMBLE) {
-					if (isClient) {
-						return StatusUtils.warningStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_WARN_NO_CLIENT_SERVER, new String[0]));
-					} else {
-						return StatusUtils.warningStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_WARN_NO_SERVICE_SERVER, new String[0]));
-					}
-				}
-			} else {
-				// Return a warning if the selected server has only stub
-				// runtimes
-				// and the scale setting is anything beyond deploy.
-				IServerType serverType = ServerCore.findServerType(serverId);
-				if (serverType != null) {
-					// Find a Runtime which is not a stub
-					IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
-					if ((scaleSetting < ScenarioContext.WS_DEPLOY) && nonStubRuntime == null && serverInstanceId == null) {
-						String servertypeLabel = WebServiceRuntimeExtensionUtils2
-								.getServerLabelById(serverId);
-						return StatusUtils.warningStatus(NLS.bind(
-								ConsumptionUIMessages.MSG_WARN_STUB_ONLY,
-								new String[] { servertypeLabel }));
-					}
-				}
-
-			}
-		}
-
-		return Status.OK_STATUS;
-
-	}
-  
-  /**
-   * Returns whether or not the provided server type supports the facet versions on the provided project
-   * @param serverFactoryId server type id
-   * @param projectName name of a project that may or may not exist.
-   * @return boolean <code>true</code> if the server type supports the facet versions on the project (facets versions are inferred from a Java project), 
-   * <code>false</code> if the server type does not support the facet versions or facet versions on the project cannot be determined.   */
-  public boolean doesServerSupportProject(String serverFactoryId, String projectName)
-  {
-	Set facets = FacetUtils.getFacetsForProject(projectName);
-	if (facets == null)
-		return true;
-	else 
-		return doesServerSupportFacets(serverFactoryId, facets); 
-  }
-
-  /**
-   * Returns whether or not the provided server type supports the facet versions in the provided set.
-   * @param serverFactoryId server type id
-   * @param facets set containing elements of type {@link IProjectFacetVersion}
-   * @return boolean <code>true</code> if the server type supports the facet versions in the provided set,
-   * <code>false</code> otherwise.
-   */
-  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 (sRuntime != null)
-      {
-	      IRuntimeType runtimeType = sRuntime.getRuntimeType();
-	      if (runtimeType != null && runtimeTypeId.equals(runtimeType.getId()))
-	      {
-	        //found a match
-	        return true;
-	      }
-      }
-    }
-    
-    return false;    
-  }
-  
-  /**
-   * Returns whether or not the provided server type supports at least one version of
-   * each of the fixed facets on the provided template
-   * @param serverFactoryId server type id
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return boolean <code>true</code> if the server type supports at least one version of
-   * each of the fixed facets on the provided template, <code>false</code> otherwise.
-   */
-  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;
-  }
-  
-  /**
-   * Returns whether or not the provided project or project type (if the project is null or does not exist)
-   * rules out the need for an EAR.
-   * @param projectName name of a project
-   * @param projectTypeId id of a {@link IFacetedProjectTemplate}. Must be non-empty if the project is null or
-   * does not exist. 
-   * @return boolean <code>true</code> if the need for an EAR is not ruled out, <code>false</code> otherwise.
-   */
-	public boolean projectOrProjectTypeNeedsEar(String projectName, String projectTypeId)
-	{
-		// If the project is a simple Java project or the project type is
-		// Java utility return false.
-		if (projectName != null && projectName.length() > 0) {
-			IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-			if (project.exists()) {
-				if (FacetUtils.isJavaProject(project)) {
-					return false;
-				}
-			}
-		}
-
-		// Project didn't rule out the need for an EAR
-		// so check the proect type
-		String templateId = projectTypeId;
-		if (templateId != null && templateId.length() > 0) {
-			if (FacetUtils.isUtilityTemplate(templateId)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-	
-	/**
-	 * Returns whether or not an J2EE 1.3 EAR project can be installed on a server of
-	 * the provided server type.
-	 * @param serverTypeId server type id
-	 * @return boolean <code>true</code> if a J2EE 1.3 EAR project can be installed on a server of
-	 * the provided server type, <code>false</code> otherwise. 
-	 */
-	public boolean serverNeedsEAR(String serverTypeId)
-	{
-		if (serverTypeId == null) {
-			return false;
-		}
-	    if (serverTypeId.length() > 0) {
-			String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverTypeId);
-			if (targetId != null && targetId.length() > 0) {
-				if (!ServerUtils.isTargetValidForEAR(targetId, "13")) // rm j2ee
-				{
-					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;
-  }
-  
-  //TODO: This method is obselete - should be removed.
-  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;        
-  }
-
-  //TODO: This method is obselete - should be removed.
-  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;        
-  }
-  
-  //TODO: This method is obselete - should be removed.
-  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;
-    
-  }
-  
-  //TODO: This method is obselete - should be removed.
-  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;
-	  }	  	  
-  }  
-  
-  /**
-   * Returns whether or not this project is likely hosting any of the services
-   * in the provided WSDL as a J2EE Web service.
-   * @param p IProject in the workspace
-   * @param wsdlURL URL of a WSDL document
-   * @param parser
-   * @return boolean <code>true</code> if the project contains a webservices.xml 
-   * deployment descriptor that points to at least one of the ports in the provided WSDL. 
-   * Returns <code>false</code> otherwise.
-   */
-  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
-    if (!(wsXML instanceof IFile))
-    {
-      return false;
-    }
-     
-    Resource res = WorkbenchResourceHelperBase.getResource((IFile)wsXML, true);
-    WsddResource wsddRes = (WsddResource)res;    
-    WebServices webServices = wsddRes.getWebServices();
-    Iterator wsDescs = webServices.getWebServiceDescriptions().iterator();
-    ArrayList wsdlPortList = new ArrayList();
-    while(wsDescs.hasNext())
-    {
-      WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
-      Iterator pcs = wsDesc.getPortComponents().iterator();
-      while(pcs.hasNext())
-      {
-        PortComponent pc = (PortComponent)pcs.next();
-        WSDLPort wsdlPort = pc.getWsdlPort();
-        wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
-      }
-    }
-    
-    ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
-    //If any of the QualifiedNames in portList equals any of the QualifiedNames
-    //in wsdlPortList, this is the service project. Return true.
-    Object[] ports = portList.toArray();
-    Object[] wsdlPorts = wsdlPortList.toArray();
-    for (int i = 0; i < ports.length; i++)
-    {
-      QualifiedName portName = (QualifiedName) ports[i];
-      for (int j = 0; j < wsdlPorts.length; j++)
-      {
-        QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
-        if (portName.equals(wsdlPortName))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-  
-  /**
-   * Returns the IResource corresponding to the webservices.xml in the provided project.
-   * @param p an IProject in the workspace.
-   * @return IResource corresponding to the webservices.xml in the provided project,
-   * null if there is no webservices.xml in the project.
-   */
-  private IResource getWebServcesXML(IProject p)
-  {
-    //Get the module root.    
-    IResource moduleRoot = getModuleRoot(p);
-    if (!(moduleRoot instanceof IContainer))
-      return null;
-
-    IResource webServicesXML = null;
-    if (J2EEProjectUtilities.isDynamicWebProject(p))
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("WEB-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer) moduleRoot).findMember(wsPath.toString());
-    }
-    else
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("META-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer) moduleRoot).findMember(wsPath.toString());      
-    }
-    return webServicesXML;
-  }
-  
-  private IResource getModuleRoot(IProject p)
-  {
-    IPath modulePath = null;
-    try 
-    {
-      IVirtualComponent vc = ComponentCore.createComponent(p);
-      if (vc != null) 
-      {
-        modulePath = vc.getRootFolder().getWorkspaceRelativePath();
-      }
-    }
-    catch(Exception ex)
-    {
-      
-    } 
-    
-    IResource res = ResourceUtils.findResource(modulePath);
-    return res;
-  }
-  
-  /**
-   * Returns a list of WSDL ports in the provided WSDL
-   * @param wsdlURL URL of a WSDL document
-   * @param parser 
-   * @return ArrayList containing elements of type {@link QualifiedName}
-   */
-  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 3e4feac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,117 +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 121071   rsinha@ca.ibm.com - Rupam Kuehner          
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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, "Context", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Context", PreClientDeployCommand.class );
-    
-    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 37e5d48..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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          
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20080325   222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-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.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.FacetUtils;
-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 PreClientAssembleCommand 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 )
-  {
-	  IStatus status = Status.OK_STATUS;
-
-	  if (context_ != null && context_.getAssemble()) {
-		  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);
-
-		  IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
-		  command.setRequiredFacetVersions(FacetUtils.getRequiredEARFacetVersions(project)); 
-
-		  command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-		  command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-		  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;  
-  }   
-  
-  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/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 cb571d8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
+++ /dev/null
@@ -1,44 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class PreClientDeployCommand extends AbstractDataModelOperation 
-{
-  private IContext    context_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    if (context_ != null && context_.getDeploy())
-    {
-      //If and when there are framework specific deploy things to be done,
-      //do them here.
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  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/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 db2cc0c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060516   126965 kathy@ca.ibm.com - Kathy Chan
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070123   167487 makandre@ca.ibm.com - Andrew Mak
- * 20070403   173654 kathy@ca.ibm.com - Kathy Chan
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080724   241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing.
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- *******************************************************************************/
-
-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.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TimedWSDLSelectionConditionCommand;
-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.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.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-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.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           develop_;
-  private boolean           assemble_;
-  private boolean           deploy_;
-  private boolean			test_;
-  private boolean			install_;
-  private boolean			run_;
-  private String            wsdlURI_;
-  private Object            dataObject_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  IStatus status = Status.OK_STATUS;
-	  
-	  if (develop_) {
-		  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);
-			  }
-		  }    
-
-		  environment.getLog().log(ILog.INFO, "ws_framework", 5108, this, "PreClientDevelopCommand", "clientRuntimeId_ = "+ clientRuntimeId_);
-		  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());
-		  
-		  // check for redirection in the wsdl
-		  HTTPUtility httpUtil = new HTTPUtility();		  
-      String      newWsdlURL  = httpUtil.handleRedirect(wsdlURI_);
-      
-      wsInfo.setWsdlURL( newWsdlURL );   
-      
-      // Validate the url before proceeding.
-      TimedWSDLSelectionConditionCommand timedCmd = new TimedWSDLSelectionConditionCommand();
-      WebServicesParser                  parser   = WSDLParserFactory.getWSDLParser();
-      
-      timedCmd.setWebServicesParser( parser );
-      timedCmd.setWebServiceURI( newWsdlURL );
-      timedCmd.execute( null, null );
-      
-      WebServiceEntity entity = parser.getWebServiceEntityByURI( newWsdlURL );
-      
-      if( entity == null || entity.getType() != WebServiceEntity.TYPE_WSDL )
-      {
-        // This isn't a wsdl file
-        status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-        environment.getStatusHandler().reportError( status );
-        return status;
-      }
-
-		  webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-		  WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-		  context_ = new SimpleContext(develop_, assemble_, deploy_, install_, run_, true, test_,
-				  false, scenario, resourceContext_.isOverwriteFilesEnabled(),
-				  resourceContext_.isCreateFoldersEnabled(), resourceContext_
-				  .isCheckoutFilesEnabled());
-
-		  // Create the client module if needed.
-		  IProject project = ProjectUtilities.getProject(project_);
-		  RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRequiredFacetVersions();
-		  if (!project.exists())
-		  {
-			  boolean matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(clientRuntimeId_, moduleType_);
-			  if (matches)
-			  {  
-				  CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-				  command.setProjectName(project_);
-				  command.setTemplateId(moduleType_);
-				  command.setRequiredFacetVersions(rfv);
-				  command.setServerFactoryId(typeRuntimeServer_.getServerId());
-				  command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-				  command.setEarProjectName(earProject_);
-				  status = command.execute( monitor, adaptable );
-				  if (status.getSeverity() == Status.ERROR)
-				  {
-					  environment.getStatusHandler().reportError( status );
-					  return status;
-				  }        
-			  }            
-		  } else {
-				// add facets required by Web service runtime
-		        if (rfv.length != 0) {
-		        	status = FacetUtils.addRequiredFacetsToProject(project, rfv, 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 setDevelopClient(boolean developClient) {
-	  develop_ = developClient;
-  }	
-
-  public void setAssembleClient(boolean assembleClient) {
-	  assemble_ = assembleClient;
-  }
-
-  public void setDeployClient(boolean deployClient)
-  {
-      deploy_ = deployClient;
-  }
-	
-  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 4cf8809..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070815   199626 kathy@ca.ibm.com - Kathy Chan
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080425   220985 trungha@ca.ibm.com - Trung Ha, Server is recreated when prev publish failed
- * 20080429   220985 trungha@ca.ibm.com - Trung Ha
- * 20080520   233065 makandre@ca.ibm.com - Andrew Mak, Server not found error in Web service generation
- * 20080722   240231 gilberta@ca.ibm.com - Gilbert Andrews
- * 
- *******************************************************************************/
-
-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.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 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_ != null && context_.getInstall())
-	  {  
-	      IEnvironment environment = getEnvironment();
-	      
-	      if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
-	      {
-    		// Attempt to find a server instance in the workspace matching
-			// the server id of the webService_
-			// If we can find one, we don't need to create a new server.
-			IServer[] allServers = ServerCore.getServers();
-			if (allServers != null && allServers.length > 0) {
-				for (int i = 0; i < allServers.length; i++) {
-					IServer oneServer = allServers[i];
-					if (oneServer.getServerType().getId().equals(
-							webServiceClient_.getWebServiceClientInfo().getServerFactoryId())) {
-						
-						webServiceClient_.getWebServiceClientInfo().setServerInstanceId(oneServer.getId());
-						webServiceClient_.getWebServiceClientInfo().setServerCreated(true);
-					}
-				}
-			}
-			// Cannot find an appropriate server, so we will create one
-			if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId() == null) {
-		        CreateServerCommand createServerCommand = new CreateServerCommand();
-		        createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-		        createServerCommand.setServerRuntimeId(webServiceClient_.getWebServiceClientInfo().getServerRuntimeId());
-		        createServerCommand.setEnvironment( environment );
-		        IStatus createServerStatus = createServerCommand.execute(null, null);
-		        if (createServerStatus.getSeverity()==Status.OK)
-		        {
-		          webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-		          webServiceClient_.getWebServiceClientInfo().setServerCreated(true);
-		        }
-		        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 boolean getCanRunTestClient(){
-  	  if(webServiceClient_.getWebServiceClientInfo().getServerInstanceId() != null) return true;
-  	  
-  	  return false;
-    }
-    
-    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 59315bf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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_ != null && 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 f599367..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,108 +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
- * -------- -------- -----------------------------------------------------------
- * 20060424   115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060504   136118 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-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;
-
-
-/**
-* 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 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 imageURL = FileLocator.find(instance_.getBundle(), new Path("$nl$/"+name), null);
-     	return ImageDescriptor.createFromURL(imageURL);
-     }
-     catch (Exception 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 5662e98..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,137 +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
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
-  public PersistentProjectTopologyContext () 
-  {
-	  super( WebServiceConsumptionUIPlugin.getInstance());
-  }
-  
-  public void load() 
-  {
-    //Load the service project types
-    String[] serviceIds = ProjectTopologyDefaults.getServiceTypes();
-    StringBuffer serviceSb = new StringBuffer();
-    for (int i = 0; i < serviceIds.length; i++)
-    {
-      if (i != 0)
-        serviceSb.append(" ");
-      serviceSb.append(serviceIds[i]);
-    }
-    setDefaultStringIfNoDefault(PREFERENCE_SERVICE_TYPES, serviceSb.toString());
-    
-    //Load the client project types
-    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 setServiceTypes(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_SERVICE_TYPES, sb.toString());
-  }
-
-  public String[] getServiceTypes()
-  {
-    StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_SERVICE_TYPES));
-    String[] s = new String[st.countTokens()];
-    for (int i = 0; i < s.length; i++)
-      s[i] = st.nextToken();
-    return s;
-  }
-  
-  public String[] getDefaultServiceTypes()
-  {
-    StringTokenizer st = new StringTokenizer(getDefaultString(PREFERENCE_SERVICE_TYPES));
-    String[] s = new String[st.countTokens()];
-    for (int i = 0; i < s.length; i++)
-      s[i] = st.nextToken();
-    return s;        
-  }
-    
- 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 String[] getDefaultClientTypes()
- {
-   StringTokenizer st = new StringTokenizer(getDefaultString(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.setServiceTypes(getServiceTypes());
-    context.setDefaultServiceTypes(getDefaultServiceTypes());
-	context.setClientTypes(getClientTypes());
-    context.setDefaultClientTypes(getDefaultClientTypes());
-	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 0163260..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080415   227152 makandre@ca.ibm.com - Andrew Mak, Need a way to specify a backup Web service runtime
- * 20080918   247537 mahutch@ca.ibm.com - Mark Hutchinson, Update default server runtime to Tomcat 6
- * 20090714   283399 ericdp@ca.ibm.com - Eric D. Peters, Web Services > Server & Runtime preference undefined
- * 20091007   283399 ericdp@ca.ibm.com - Eric D. Peters, Web Services > Server & Runtime preference undefined 
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
-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 FALLBACK_RUNTIME = "FALLBACK_RUNTIME";  // Web service runtime to fallback to if preferred runtime is not suitable
-	//private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-	
-	private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.60";
-	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 || WebServiceRuntimeExtensionUtils2.getServerLabelById(serverDefault)==null)
-		{
-		  setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
-		}
-
-		String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
-		if (WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeDefault)==null)
-			//try again using fall back runtime
-			runtimeDefault = getDefaultString(FALLBACK_RUNTIME);
-		if (runtimeDefault==null || runtimeDefault.length()==0 || WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeDefault)==null)
-		{
-		  setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
-		} else {
-		  setDefault(PREFERENCE_RUNTIME, runtimeDefault);
-		}
-				
-	}
-	
-	public String getDefaultServerFactoryId()
-	{
-		return getDefaultString(PREFERENCE_SERVER);
-	}
-
-	public String getDefaultRuntimeId()
-	{
-		return getDefaultString(PREFERENCE_RUNTIME);
-	}
-
-	public String getFallbackRuntimeId()
-	{
-		return getDefaultString(FALLBACK_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 cc21c4b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyContext.java
+++ /dev/null
@@ -1,42 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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";
-  public static final String PREFERENCE_SERVICE_TYPES = "serviceTypes";
-  
-  /**
-    * This constant String is used to lookup the two EAR option
-  **/
-  public static final String PREFERENCE_USE_TWO_EARS = "useTwoEARs";
-  
-  public void setServiceTypes(String[] ids);
-  public String[] getServiceTypes();
-  public String[] getDefaultServiceTypes();
-  
-  public void setClientTypes(String[] ids);
-  public String[] getClientTypes();
-  public String[] getDefaultClientTypes();
-
-  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 e19e1f5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyDefaults.java
+++ /dev/null
@@ -1,36 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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[] getServiceTypes()
-  {
-    return WebServiceRuntimeExtensionUtils2.getAllServiceProjectTypes();
-  }
-  
-  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 2165b2b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,454 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060515   141398 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-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.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-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 + ".PTPP0001";
-
-  private TableViewer serviceTypeViewer_;
-  private Button serviceMoveUp_;
-  private Button serviceMoveDown_;
-  private Vector serviceTypes_;
-  
-  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);  
-
-    Group serviceTypeComposite = new Group( parent, SWT.NONE );
-    GridLayout servicegl = new GridLayout();
-    servicegl.numColumns = 2;
-    //servicegl.marginHeight = 0;
-    //servicegl.marginWidth = 0;
-    serviceTypeComposite.setLayout(servicegl);
-    serviceTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-    serviceTypeComposite.setText(WSUIPluginMessages.LABEL_SERVICE_TYPE_NAME);
-    
-    Table serviceTable= new Table(serviceTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData servicegd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    servicegd.widthHint = 256;
-    serviceTable.setLayoutData(servicegd);
-    serviceTable.setToolTipText(WSUIPluginMessages.TOOLTIP_SERVICE_TYPE_TABLE_VIEWER);
-
-    serviceTypes_ = new Vector();
-    serviceTypeViewer_ = new TableViewer(serviceTable);
-    serviceTypeViewer_.setContentProvider(new ClientTypeContentProvider());
-    serviceTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
-    serviceTypeViewer_.setInput(serviceTypes_);
-
-    TableLayout serviceTableLayout = new TableLayout();
-    TableColumn serviceTableColumn = new TableColumn(serviceTable, SWT.NONE);
-    serviceTableColumn.setText(WSUIPluginMessages.LABEL_SERVICE_TYPE_NAME);
-    ColumnWeightData serviceColumnData = new ColumnWeightData(256, 256, false);
-    serviceTableLayout.addColumnData(serviceColumnData);
-    serviceTable.setLayout(serviceTableLayout);
-    
-    Composite servicec = new Composite(serviceTypeComposite, SWT.NONE);
-    servicegl = new GridLayout();
-    servicegl.numColumns = 1;
-    //servicegl.marginHeight = 10;
-    servicegl.marginWidth = 0;
-    servicec.setLayout(servicegl);
-    servicec.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-    serviceMoveUp_ = new Button(servicec, SWT.PUSH);
-    serviceMoveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP);
-    serviceMoveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    serviceMoveUp_.addSelectionListener(this);
-    serviceMoveUp_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_UP);
-
-    serviceMoveDown_ = new Button(servicec, SWT.PUSH);
-    serviceMoveDown_.setText(WSUIPluginMessages.LABEL_MOVE_DOWN);
-    serviceMoveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    serviceMoveDown_.addSelectionListener(this);
-    serviceMoveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
-    serviceTable.addSelectionListener(new TableSelectionListener(serviceMoveUp_, serviceMoveDown_, serviceTable));
-
-    Group clientTypeComposite = new Group( 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 ));
-    clientTypeComposite.setText(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-
-    Table clientTable= 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;
-    clientTable.setLayoutData(gd);
-    clientTable.setToolTipText(WSUIPluginMessages.TOOLTIP_CLIENT_TYPE_TABLE_VIEWER);
-
-    clientTypes_ = new Vector();
-    clientTypeViewer_ = new TableViewer(clientTable);
-    clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
-    clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
-    clientTypeViewer_.setInput(clientTypes_);
-
-    TableLayout tableLayout = new TableLayout();
-    TableColumn tableColumn = new TableColumn(clientTable, SWT.NONE);
-    tableColumn.setText(WSUIPluginMessages.LABEL_CLIENT_TYPE_NAME);
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    clientTable.setLayout(tableLayout);
-
-    Composite c = new Composite(clientTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    //gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-    c.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(WSUIPluginMessages.LABEL_MOVE_UP_2);
-    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_2);
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(WSUIPluginMessages.TOOLTIP_MOVE_DOWN);
-
-    clientTable.addSelectionListener(new TableSelectionListener(moveUp_, moveDown_, clientTable));
-
-    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)  { }
-
-  
-  /**
-   * Adds the String elements of array a into Vector v. If String array b contains any elements
-   * that are not already in array a, appends these elements from array b to the end of Vector v. 
-   * @param a a String array
-   * @param b a String array
-   * @param v a non-null Vector
-   */
-  private void setVectorContentsFromTwoArrays(String[] a, String[] b, Vector v)
-  {
-    for (int i = 0; i < a.length; i++)
-    {
-      v.add(a[i]);
-    }
-    
-    for (int i = 0; i < b.length; i++)
-    {
-      if (v.indexOf(b[i]) == -1)
-      {
-        v.add(b[i]);
-      }
-    }   
-  }
-  
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-    serviceTypes_.clear();
-    String[] defaultServiceTypes = context.getDefaultServiceTypes();
-    String[] allServiceTypes = ProjectTopologyDefaults.getServiceTypes();
-    setVectorContentsFromTwoArrays(defaultServiceTypes, allServiceTypes, serviceTypes_);    
-    serviceTypeViewer_.refresh();
-    
-    clientTypes_.clear();
-    String[] defaultClientTypes = context.getDefaultClientTypes();
-    String[] allClientTypes = ProjectTopologyDefaults.getClientTypes();
-    setVectorContentsFromTwoArrays(defaultClientTypes, allClientTypes, clientTypes_);         
-    clientTypeViewer_.refresh();
-    
-    twoEAR_.setSelection(true);
-  }
-  
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-    //Initial service project types.
-    ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-    String[] serviceTypesFromContext = context.getServiceTypes();
-    String[] allServiceTypes = ProjectTopologyDefaults.getServiceTypes();
-    setVectorContentsFromTwoArrays(serviceTypesFromContext, allServiceTypes, serviceTypes_);
-    if (allServiceTypes.length > serviceTypesFromContext.length)
-    {
-      String[] serviceTypesArray = new String[serviceTypes_.size()];
-      serviceTypes_.copyInto(serviceTypesArray);
-      context.setServiceTypes(serviceTypesArray);
-    }
-    // refresh viewer
-    serviceTypeViewer_.refresh();
-    
-    // select the first item in this table
-    if (serviceTypeViewer_.getTable().getItemCount() > 0){
-    	serviceTypeViewer_.getTable().setSelection(0);
-    	serviceTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
-    }
-
-    //Initialize client project types.
-    String[] clientTypesFromContext = context.getClientTypes();
-    String[] allClientTypes = ProjectTopologyDefaults.getClientTypes();
-    setVectorContentsFromTwoArrays(clientTypesFromContext, allClientTypes, clientTypes_);
-    if (allClientTypes.length > clientTypesFromContext.length)
-    {
-      String[] clientTypesArray = new String[clientTypes_.size()];
-      clientTypes_.copyInto(clientTypesArray);
-      context.setClientTypes(clientTypesArray);
-    }
-    
-    // refresh viewer
-    clientTypeViewer_.refresh();
-    
-    // select the first item in this table
-    Table table = clientTypeViewer_.getTable();
-	if (table.getItemCount() > 0){
-    	table.setSelection(0);
-    	table.notifyListeners(SWT.Selection, new Event());
-    }
-    
-    twoEAR_.setSelection(context.isUseTwoEARs());
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ProjectTopologyContext context = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-    String[] serviceTypesArray = new String[serviceTypes_.size()];
-    serviceTypes_.copyInto(serviceTypesArray);
-    context.setServiceTypes(serviceTypesArray);    
-    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)
-  {
-    if (e.widget == serviceMoveUp_ || e.widget == serviceMoveDown_)
-    {
-      int index = serviceTypeViewer_.getTable().getSelectionIndex();
-      if (index != -1)
-      {
-        if (e.widget == serviceMoveUp_ && index > 0)
-        {
-          Object object = serviceTypes_.remove(index);
-          serviceTypes_.insertElementAt(object, index-1);
-          serviceTypeViewer_.refresh();
-        }
-        else if (e.widget == serviceMoveDown_ && index < serviceTypes_.size()-1)
-        {
-          Object object = serviceTypes_.remove(index);
-          serviceTypes_.insertElementAt(object, index+1);
-          serviceTypeViewer_.refresh();
-        }
-        serviceTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
-      }
-    }
-    else if (e.widget == moveUp_ || e.widget == moveDown_)
-    {
-      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();
-        }
-        clientTypeViewer_.getTable().notifyListeners(SWT.Selection, new Event());
-      }
-    }
-  }
-
-  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();
-    }
-  }
-  
-  protected class TableSelectionListener implements SelectionListener
-  {
-    private Button down;
-    private Button up;
-    private Table  table;
-
-    public TableSelectionListener(Button up, Button down, Table ownerTable)
-    {
-      this.up = up;
-      this.down = down;
-      this.table = ownerTable;
-    }
-
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      widgetSelected(e);
-    }
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      int i = table.getSelectionIndex();
-      if (i == table.getItemCount() - 1) down.setEnabled(false);
-      else if (i > -1) down.setEnabled(true);
-      if (i == 0) up.setEnabled(false);
-      else if (i > -1) up.setEnabled(true);
-    }
-  }
-}
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 88abe51..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,366 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060728	  151723 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070109   130965 kathy@ca.ibm.com - Kathy Chan
- * 20080428   224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20080512   180135 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-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;
-
-import com.ibm.icu.text.Collator;
-
-
-/**
- *
- */
-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 = "SRPF0001";
-	private Combo server_;
-
-	/* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
-	private String INFOPOP_SRPF_RUNTIME_PREF = "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();
-	  applyDialogFont(page);
-	  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);
-		
-		// TODO (see bug 116025) - Since the server and runtime set in serverToRuntimeToJ2EE is just the list of 
-		// all servers and all runtime (i.e. no validation checking is being done), no need to update the runtime,
-		// just keep the original value.
-		//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());
-		  Collator collator = Collator.getInstance();
-		  Arrays.sort(serverLabels, collator);
-		  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]);
-		}
-
-		//sort the labels (bug 151723)
-		Collator collator = Collator.getInstance();
-		Arrays.sort(runtimeLabels, collator);
-		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 1102733..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/TransientProjectTopologyContext.java
+++ /dev/null
@@ -1,90 +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
- * -------- -------- -----------------------------------------------------------
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-
-public class TransientProjectTopologyContext implements ProjectTopologyContext
-{
- private String[] serviceTypes;
- private String[] defaultServiceTypes;
- 
- private String[] clientTypes;
- private String[] defaultClientTypes;
- 
- private boolean twoEARs;
- 
- public TransientProjectTopologyContext () {}
-
- public void setServiceTypes(String[] serviceTypes)
- {
-   this.serviceTypes = serviceTypes;
- }
- public String[] getServiceTypes()
- {
-   return serviceTypes;
- }
- 
- 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.setServiceTypes(getServiceTypes());
-    context.setDefaultServiceTypes(getDefaultServiceTypes());
-	context.setClientTypes(getClientTypes());
-    context.setDefaultClientTypes(getDefaultClientTypes());
-	context.setUseTwoEARs(isUseTwoEARs());
-	return context;
- }
-
- 
-public void setDefaultServiceTypes(String[] defaultServiceTypes)
-{
-  this.defaultServiceTypes = defaultServiceTypes;
-}
-
-public String[] getDefaultServiceTypes()
-{
-  return defaultServiceTypes;
-
-}
-
-
-public void setDefaultClientTypes(String[] defaultClientTypes)
-{
-  this.defaultClientTypes = defaultClientTypes;
-}
-
-public String[] getDefaultClientTypes()
-{
-  return defaultClientTypes;
-
-}
-}
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 2397f2c..0000000
--- 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, 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.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 4a5a76d..0000000
--- 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 e677208..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20080722   240231 gilberta@ca.ibm.com - Gilbert Andrews
- * 
- *******************************************************************************/
-
-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 && webserviceClient_.getWebServiceClientInfo().getServerInstanceId() != null  && context_.getRun())
-    {
-      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 5e62fef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070314   176886 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-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.BaseStatusHandler;
-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.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) 
-	  {
-	    BaseStatusHandler        handler         = new BaseStatusHandler();
-	    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 d92f6ab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,121 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- *******************************************************************************/
-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/AbstractObjectSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractObjectSelectionLaunchable.java
deleted file mode 100644
index 1c00cca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractObjectSelectionLaunchable.java
+++ /dev/null
@@ -1,53 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-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.swt.widgets.Shell;
-
-public abstract class AbstractObjectSelectionLaunchable implements IObjectSelectionLaunchable {
-
-	public int launch(Shell shell) {		
-		return -1;
-	}
-	
-	public IStatus validateSelection(IStructuredSelection objectSelection) {
-		 //  subclass should override this method
-		 return Status.OK_STATUS;
-	}
-	
-	public IStructuredSelection getObjectSelection() {
-		 //  subclass should override this method
-		return new StructuredSelection();
-	}
-	
-	public void setInitialSelection(IStructuredSelection initialSelection) {
-		 //  subclass should override this method
-	}	
-	
-	public String getObjectSelectionDisplayableString()
-	{
-		 //  subclass should override this method
-		return "";
-	}
-	
-	public boolean validate(String s) {
-		// subclass should override this method
-		return true;
-	}  
-
-}
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 045aa36..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,265 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- * 20060529   143518 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-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 boolean isMultipleServices_;
-  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);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    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_ && !isMultipleServices_){
-      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_ && !isMultipleServices_){
-  		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);
-  }
-  
-  public void setIsMultipleServices(boolean isMultipleServices){
-    this.isMultipleServices_ = isMultipleServices;
-  }
-}
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 3962d82..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
+++ /dev/null
@@ -1,106 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060420   120714 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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 {
-					  // Setting the error string to an empty string so that the command engine would not
-					  // pop-up another error message when the user decided to wait for WSDL validation.
-					  return StatusUtils.errorStatus( "" );
-				  }
-			  }
-		  }
-	  }
-	  
-      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;
-	}
-  
-
-}
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 b9fb927..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,329 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Collection;
-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.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.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-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 WebServicesManager webServicesManager_;
-
-  private IProject project_;
-  
-  private String serviceRefName_ = null;
-  
-  private List wsServiceRefs_;
-  
-  private HandlerServiceRefHolder[] handlerServiceRefHolder_;
-  private String errorStatusMsg_ = null;
-  private boolean isMultipleSelection_;
-  
-  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;
-    }
-    else if (selection.size()>1){
-      status = processMultipleHandlers();
-      return status;
-    }
-
-    status = processHandlers();
-    return status;
-
-  }
-
-  /**
-   * For processing handlers
-   * @return
-   */
-  public IStatus processHandlers() {
-    try {
-
-      Collection selectedServiceRefs = getWSServiceRefsFromSelection(); // get initial selection values
-      if (selectedServiceRefs==null || selectedServiceRefs.isEmpty()){
-        //report no Web service client is available
-      return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WEB_SERVICE_CLIENTS_NOT_FOUND);
-      }
-      wsServiceRefs_ = webServicesManager_.getAllWorkspaceServiceRefs(); 
-
-      if (wsServiceRefs_ != null) {
-        int numberOfServiceRefs = wsServiceRefs_.size();
-        handlerServiceRefHolder_ = new HandlerServiceRefHolder[numberOfServiceRefs];
-        
-        for (int i = 0; i < numberOfServiceRefs; i++) {
-          ServiceRef wsServiceRef = (ServiceRef) wsServiceRefs_.get(i);
-          Vector handlers = new Vector();
-          List wsHandlers = wsServiceRef.getHandlers();
-      
-          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);
-
-            handlers.add(handlerItem);
-          }
-          String wsServiceRefName = wsServiceRef.getServiceRefName();
-          handlerServiceRefHolder_[i] = new HandlerServiceRefHolder();
-          handlerServiceRefHolder_[i].setHandlerList(handlers);
-          handlerServiceRefHolder_[i].setServiceRef(wsServiceRef);
-          handlerServiceRefHolder_[i].setServiceRefName(wsServiceRefName);
-          
-        }
-
-      }
-      
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED, e);
-    }
-    return Status.OK_STATUS;
-  }
-
-  public IStatus processMultipleHandlers(){
-      ServiceRef[] serviceRefs = getServiceRefs();
-      if (errorStatusMsg_ != null){
-          return StatusUtils.errorStatus(errorStatusMsg_);
-      }
-      isMultipleSelection_ = true;
-      
-      handlerServiceRefHolder_ = new HandlerServiceRefHolder[serviceRefs.length];
-      Vector handlers = new Vector();
-      for (int i=0;i<serviceRefs.length;i++){
-        
-        String refName = serviceRefs[i].getServiceRefName();
-        handlerServiceRefHolder_[i] = new HandlerServiceRefHolder();
-        handlerServiceRefHolder_[i].setHandlerList(handlers);
-        handlerServiceRefHolder_[i].setServiceRefName(refName);
-        handlerServiceRefHolder_[i].setServiceRef(serviceRefs[i]);
-      }
-      return Status.OK_STATUS;      
-  }
-  
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    if (isMultipleSelection_)
-      return false;    
-    return true;
-  }
-
-
-  public String getServiceRefName() {
-    return this.serviceRefName_;
-  }
-
-  public IProject getClientProject() {
-    return project_;
-  }
-  
-  private ServiceRef[] getServiceRefs(){
-      IStructuredSelection initSel = getInitialSelection();
-      ServiceRef[] serviceRefs = new ServiceRef[initSel.size()];
-      Iterator iter = initSel.iterator();
-      for (int i=0;i<initSel.size();i++) {
-          Object obj = iter.next();
-          if (obj instanceof ServiceRef){
-              serviceRefs[i] = (ServiceRef)obj;
-          }
-          else{
-              errorStatusMsg_ = ConsumptionUIMessages.MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
-              return null;
-          }
-      }
-      return serviceRefs;
-}
-
-  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();
-              if (!serviceRefs.isEmpty()) {
-                ServiceRef ref = (ServiceRef)((List)serviceRefs).get(0);
-                serviceRefName_ = ref.getServiceRefName();
-                project_ = ProjectUtilities.getProject(ref);
-                return serviceRefs;
-              }
-              return null;
-          }
-          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 Collection getWsServiceRefs(){
-    return this.wsServiceRefs_;
-  }
-
-  public boolean getIsMultipleSelection(){
-      return this.isMultipleSelection_;
-  }
-  
-  public HandlerServiceRefHolder[] getHandlerServiceRefHolder(){
-    return this.handlerServiceRefHolder_;
-  }
-}
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 4cee18a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,207 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu  
- * 20060517   142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-
-import 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.common.HandlerServiceRefHolder;
-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 HandlerServiceRefHolder[] handlerServiceRefHolder_;
-  private Hashtable oldWSServiceRefsToHandlersTable_;
-  private Hashtable newWSServiceRefsToHandlersTable_;
-  private IProject project_;
-  private boolean isMultipleSelection_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-
-    try {
-      
-      if (isMultipleSelection_) {
-        if (handlerServiceRefHolder_ != null) {
-          // add new handler to internal model if it doesn't already exist
-          for (int i = 0; i < handlerServiceRefHolder_.length; i++) {
-            handlerServiceRefHolder_[i].addHandlerToServiceRef();
-            saveEditModel(handlerServiceRefHolder_[i].getProject());
-          }
-          
-        }
-        
-      }
-      else {
-        oldWSServiceRefsToHandlersTable_ = new Hashtable();
-        newWSServiceRefsToHandlersTable_ = new Hashtable();
-        
-        if (handlerServiceRefHolder_ != null) {
-  
-          for (int i = 0; i < handlerServiceRefHolder_.length; i++) {
-  
-            ServiceRef wsServiceRef =handlerServiceRefHolder_[i].getServiceRef(); 
-        
-            List wsHandlers = wsServiceRef.getHandlers();
-            oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
-            newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
-          }
-  
-          //Enumeration e = handlersTable_.keys();
-          for (int j=0;j<handlerServiceRefHolder_.length;j++) {
-
-            List handlerTableItems_ =  handlerServiceRefHolder_[j].getHandlerList();
-            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 saveEditModel(IProject project){
-	  project_ = project;
-	  saveEditModel();
-  }
-  
-  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();
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-
-  public void setClientProject(IProject project) {
-    this.project_ = project;
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
-    this.handlerServiceRefHolder_ = handlerHolders;
-  }
-  
-  public void setIsMultipleSelection(boolean isMulitpleSelection) {
-    this.isMultipleSelection_ = isMulitpleSelection;
-  }
-
-}
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 648f6b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060407   135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060417   136390/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- * 20060424   138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425   137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060509   119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060612   145081 pmoogk@ca.ibm.com - Peter Moogk
- * 20060725   149351 makandre@ca.ibm.com - Andrew Mak, Deleted service definition keeps reappearing
- * 20060803   152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060817   140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060825   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060829   155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20060907   156211 makandre@ca.ibm.com - Andrew Mak, Selecting service definition invalidated project config when creating web service java client
- * 20061212   159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
- * 20060125   159911 kathy@ca.ibm.com - Kathy Chan, Remove unused method and imports
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20090926   248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-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.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer;
-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.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.SelectionAdapter;
-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.IWorkbench;
-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.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-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.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor implements Runnable
-{  
-  private WebServiceClientTypeWidget clientWidget_;
-  private Button overwriteButton_;
-  private Button monitorService_;
-
-  private Text serviceImpl_;
-  private Button browseButton_;
-  private WSDLSelectionDialog wsdlDialog_;
-  private String componentName_;
-  private IProject project_;
-  private String webServiceURI_;
-  private WebServicesParser parser_;
-  private ResourceContext resourceContext_;
-  
-  private Listener statusListener_;
-  private ModifyListener objectModifyListener_ ;
-  private int validationState_;
-  private boolean validObjectSelection_ = true;
-  private WSDLSelectionWidgetWrapper wsdlValidatorWidget_;
-
-  private Timer timer_ = null;
-  
-  /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
-
-  
-  /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
-  private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";	
-  /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
-  private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";	
-  /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
-  private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
-  
-  /**
-   * Run this ClientWizardWidget, which validates the entry field values. 
-   */
-  public void run() {
-	  validationState_ = ValidationUtils.VALIDATE_ALL;
-	  statusListener_.handleEvent(null);
-	  if (validObjectSelection_)
-		  callObjectTransformation(project_, 
-				  wsdlValidatorWidget_.getComponentName(), 
-				  wsdlValidatorWidget_.getWsdlURI());	  
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    UIUtils      utils    = new UIUtils( pluginId );
-    utils.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
-
-    statusListener_ = statusListener;
-	validationState_ = ValidationUtils.VALIDATE_ALL;
-  	// Create text field and browse for service selection
-  	Composite typeComposite = utils.createComposite(parent, 3);
-	serviceImpl_ = utils.createText(typeComposite, ConsumptionUIMessages.LABEL_WEBSERVICEDEF, 
-			ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL,
-			INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL, SWT.LEFT | SWT.BORDER );
-	
-	Object layoutData = serviceImpl_.getLayoutData();
-	if (layoutData instanceof GridData) {
-		((GridData)layoutData).widthHint = 225;
-	}
-	
-	objectModifyListener_ = new ModifyListener(){
-		public void modifyText(ModifyEvent e) {
-			if (serviceImpl_.getText().indexOf(':') > 0) {
-		        timer_ = Timer.newInstance(timer_, Display.getCurrent(), ClientWizardWidget.this);
-		        timer_.startTimer();
-			}
-		    else
-		        run();
-		}
-	};
-	
-	serviceImpl_.addModifyListener(objectModifyListener_);
-	
-	browseButton_ = utils.createPushButton(typeComposite,
-			ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-	
-	IWorkbench workbench = PlatformUI.getWorkbench();
-    wsdlDialog_ = new WSDLSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
-		  						new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "", 
-		                        new WidgetContributorFactory()
-		  						{	
-		  							public WidgetContributor create()
-		  							{	  						 
-		  							   return new WSDLSelectionWidgetWrapper();
-		  							}
-		  						}));		
-	browseButton_.addSelectionListener(new WSDLBrowseListener());
-	
-	utils.createHorizontalSeparator(parent, 1);
-	
-	Composite clientComposite = utils.createComposite( parent, 1, 0, 0 );
-	
-    clientWidget_ = new WebServiceClientTypeWidget(true);
-    clientWidget_.addControls(clientComposite , statusListener );
-   
-    //  Create test service check box.
-    Composite buttonGroup = utils.createComposite(clientComposite,1);
-    
-    // Create monitor service check box.
-    monitorService_ = utils.createCheckbox(buttonGroup , ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE,
-    									ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE,
-    									INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);
-
-    //show overwrite if it is enabled in the preferences
-    if (getResourceContext().isOverwriteFilesEnabled()) {
-		Label prefSeparator = utils.createHorizontalSeparator(parent, 1);
-		prefSeparator.setText("File Options");
-		Composite prefButtonPanel = utils.createComposite(parent, 1);
-		overwriteButton_ = utils.createCheckbox(prefButtonPanel,
-				ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, 
-				ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, 
-				INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE);
-		overwriteButton_.setSelection(getResourceContext()
-				.isOverwriteFilesEnabled());
-		overwriteButton_.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				getResourceContext().setOverwriteFilesEnabled(overwriteButton_.getSelection());
-			}
-		});
-	}
-    return this;
-  }
-  
-  public void setResourceContext( ResourceContext context )
-  {    
-	  resourceContext_ = context;
-  }
-   
-  public ResourceContext getResourceContext()
-  {   
-    if (resourceContext_ == null) {
-		resourceContext_ = WebServicePlugin.getInstance()
-				.getResourceContext();
-	}
-	return resourceContext_;
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {	  
-    clientWidget_.setTypeRuntimeServer( ids );
-  }
-  
-  public void setClientProjectName(String name)
-  {
-	  clientWidget_.setClientProjectName(name);
-  }
-  
-  public void setClientEarProjectName(String name)
-  {
-	  clientWidget_.setClientEarProjectName(name);
-  }
-  
-  public void setClientComponentType(String name)
-  {
-	  clientWidget_.setClientComponentType(name);	  
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-	  clientWidget_.setClientNeedEAR(b);
-  }
-  
-  public String getClientRuntimeId()
-  {
-	  return clientWidget_.getClientRuntimeId();
-  }
-  
-  public String getClientEarProjectName()
-  {
-	  return clientWidget_.getClientEarProjectName();
-  }
-  
-  public String getClientProjectName()
-  {
-	  return clientWidget_.getClientProjectName();
-  }
-  
-  public String getClientComponentType()
-  {
-	  return clientWidget_.getClientComponentType();
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-	  return clientWidget_.getClientNeedEAR();
-  }
-  
- public void setWebServiceURI(String uri)
- {
-     webServiceURI_ = uri;    
- }
- 
-public void internalize() {		
-
-	if (webServiceURI_ == null || webServiceURI_.length() == 0)
-		return;
-
-	serviceImpl_.removeModifyListener(objectModifyListener_);
-	serviceImpl_.setText(webServiceURI_);    	 
-	serviceImpl_.addModifyListener(objectModifyListener_);
-		
-	EclipseIPath2URLStringTransformer transformer = new EclipseIPath2URLStringTransformer();
-	webServiceURI_ = (String) transformer.transform(webServiceURI_);    
-}
- 
- public void setProject(IProject project)
- {
-     project_ = project;
- }
-  public void setComponentName(String name)
-  {
-      componentName_ = name;      
-  } 
-  
-  public String getWebServiceURI()
-  {
-      return webServiceURI_ ;
-  }
-  
-  public String getWsdlURI()
-  {
-	  return getWebServiceURI();
-  }
-  
-  public IProject getProject()
-  {
-      return project_;
-  }
-  
-   public String getComponentName()
-   {
-       return componentName_ ;
-   }
-  
-   public WebServicesParser getWebServicesParser()
-	{
-		return WSDLParserFactory.getWSDLParser();
-	}
-	
-	public void setWebServicesParser(WebServicesParser parser)
-	{
-		parser_ = getWebServicesParser();
-		clientWidget_.setWebServicesParser(parser_);
-	}
-   
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getTypeRuntimeServer();  
-  }
-  
-  public void setInstallClient( Boolean install)
-  {
-    clientWidget_.setInstallClient( install );
-  }
-  
-  public Boolean getInstallClient()
-  {
-	  return clientWidget_.getInstallClient();   
-  }
-  
-  public Boolean getTestService()
-  {
-	  return clientWidget_.getTestClient(); 
-  }
-  
-  public void setTestService( Boolean value )
-  {
-      clientWidget_.setTestClient(value);  
-  }
-  
-  public int getClientGeneration()
-  {
-	  return clientWidget_.getClientGeneration();
-  }
-  
-  public void setClientGeneration(int value)
-  {
-	  clientWidget_.setClientGeneration(value);
-  }
-  
-  public void setDevelopClient(boolean develop) {
-		clientWidget_.setDevelopClient( develop );
-	}
-
-	public boolean getDevelopClient() {		
-		return clientWidget_.getDevelopClient();
-	}
-	
-	public void setAssembleClient(boolean assemble) {
-		clientWidget_.setAssembleClient( assemble );
-	}
-
-	public boolean getAssembleClient() {		
-		return clientWidget_.getAssembleClient();
-	}
-	
-	public void setDeployClient(boolean deploy) {
-		clientWidget_.setDeployClient( deploy );
-	}
-
-	public boolean getDeployClient() {		
-		return clientWidget_.getDeployClient();
-	}
-	
-	public void setStartClient(Boolean start) {
-		clientWidget_.setStartClient( start );
-	}
-
-	public Boolean getStartClient() {	
-		return clientWidget_.getStartClient();
-	}
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(monitorService_.getSelection());
-  }
-  
-  public void setMonitorService(Boolean value)
-  {
-    monitorService_.setSelection(value.booleanValue());
-  }
-
-  public IStatus getStatus() {
-				
-		validObjectSelection_ = false;	// assume false at first
-
-		IStatus missingFieldStatus = checkMissingFieldStatus();
-		if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
-			return missingFieldStatus;
-		}
-
-		IStatus invalidServiceImplStatus = checkServiceImplTextStatus();
-		if (invalidServiceImplStatus.getSeverity() == IStatus.ERROR) {
-			return invalidServiceImplStatus;
-		}
-
-		IStatus possibleErrorStatus = checkErrorStatus();
-		if (possibleErrorStatus.getSeverity() == IStatus.ERROR) {
-			return possibleErrorStatus;
-		}
-
-		IStatus possibleWarningStatus = checkWarningStatus();
-		if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
-			return possibleWarningStatus;
-		}
-
-		// if no errors or warnings were found, clear the validation state.
-		validationState_ = ValidationUtils.VALIDATE_NONE;
-		clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
-
-		return Status.OK_STATUS;
-	}
-	
-	private IStatus checkMissingFieldStatus() {
-
-		if (validationState_ == ValidationUtils.VALIDATE_ALL) {
-			if (serviceImpl_.getText().trim().length() == 0) {
-				return StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVICE_SELECTION, new String[]{ConsumptionUIMessages.LABEL_WEBSERVICEIMPL}));
-			}
-		}
-		
-		IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
-		if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
-			return clientMissingFieldsStatus;
-		}
-		
-		return Status.OK_STATUS;
-
-	}
-
-	private IStatus checkErrorStatus() {
-		IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
-		if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
-			return clientSideErrorStatus;
-		}
-		return Status.OK_STATUS;
-	}
-
-	private IStatus checkWarningStatus() {
-		IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
-		if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
-			return clientWarningStatus;
-		}
-		return Status.OK_STATUS;
-	}	
-	
-	/*call validation code in the object selection widget to ensure
-	 any modifications to the serviceImpl_ field are valid*/
-	private IStatus checkServiceImplTextStatus() {
-		
-		String fieldText = serviceImpl_.getText().trim();
-
-		if (wsdlValidatorWidget_ == null)
-			wsdlValidatorWidget_ = new WSDLSelectionWidgetWrapper();
-		
-		validObjectSelection_ = wsdlValidatorWidget_.validate(fieldText);
-				
-		if (!validObjectSelection_)
-		{
-			return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);			
-		}		
-		
-		return Status.OK_STATUS;
-	}
-	
-	private void callObjectTransformation(IProject project, String componentName,
-			String wsdlURI)
-	{
-		   WSDLSelectionOutputCommand wsdlOutputCommand = new WSDLSelectionOutputCommand();
-		   wsdlOutputCommand.setComponentName(componentName);
-		   wsdlOutputCommand.setProject(project);
-		   wsdlOutputCommand.setWsdlURI(wsdlURI);
-		   wsdlOutputCommand.setTestService(getTestService().booleanValue());
-		   wsdlOutputCommand.setWebServicesParser(getWebServicesParser());
-		
-           wsdlOutputCommand.execute(null, null);
-      
-           setComponentName(wsdlOutputCommand.getComponentName());
-           setProject(wsdlOutputCommand.getProject());
-           setWebServicesParser(wsdlOutputCommand.getWebServicesParser());
-           setWebServiceURI(wsdlOutputCommand.getWsdlURI());
-           
-           // bug 159911: our starting point is a wsdl, we should not need to
-           // refresh the runtime everytime the user specify a new wsdl path
-           // refreshClientRuntimeSelection();
-     }
-	
-  private class WSDLBrowseListener implements SelectionListener
-  {
-	  public void widgetDefaultSelected(SelectionEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-	  public void widgetSelected(SelectionEvent e) {
-		  
-		   wsdlDialog_.setComponentName(getComponentName());
-		   wsdlDialog_.setProject(getProject());
-		   wsdlDialog_.setWebServiceURI( serviceImpl_.getText() );		
-		   
-		   int result = wsdlDialog_.open();
-		   
-		   if (result == Dialog.OK)
-		   {
-			   serviceImpl_.removeModifyListener(objectModifyListener_);
-			   serviceImpl_.setText(wsdlDialog_.getDisplayableSelectionString());
-			   serviceImpl_.addModifyListener(objectModifyListener_);
-			   
-			   // call WSDLSelectionOutputCommand to carry out any transformation on the objectSelection
-	           callObjectTransformation(project_,
-	        			wsdlDialog_.getComponentName(), wsdlDialog_.getWebServiceURI());
-	           
-		       validationState_ = ValidationUtils.VALIDATE_ALL;
-		       clientWidget_.setValidationState(ValidationUtils.VALIDATE_ALL);
-		       statusListener_.handleEvent(null); //validate the page
-		   }
-	  }
-	}
-}
-
-
-
-
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 9892c8b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060728   150560 kathy@ca.ibm.com - Kathy Chan
- * 20060728   151078 kathy@ca.ibm.com - Kathy Chan
- * 20080402   225378 makandre@ca.ibm.com - Andrew Mak, Client wizard runtime/server defaulting is not respecting the preference
- * 20080528   234487 makandre@ca.ibm.com - Andrew Mak, Performance degradation in Web service client gen
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- *******************************************************************************/
-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.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation
-{    
-	private int clientGeneration_;
-	private boolean developClient_;
-	private boolean assembleClient_;
-	private boolean deployClient_;
-	private boolean installClient_;
-	private boolean startClient_;
-	private boolean testClient_;
-	private boolean clientOnly_ = false;
-	private TypeRuntimeServer clientTypeRuntimeServer_;
-	  
-	public ClientWizardWidgetDefaultingCommand() {
-	}
-	
-	
-	/**
-	 * @param clientOnly  Set to true for if called from ClientWidgetWizard
-	 */
-	public ClientWizardWidgetDefaultingCommand(boolean clientOnly) {
-		clientOnly_ = clientOnly;
-	}
-	
-  public Boolean getTestService()
-  {
-    return new Boolean( getScenarioContext().getTestWebService() );
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean( getScenarioContext().getMonitorWebService());
-  }
-  
-  public boolean getInstallClient()
-  {
-    return installClient_; 
-  }
-  
-  public boolean getRunTestClient()
-  {
-    return getScenarioContext().isLaunchSampleEnabled() ;  
-  }
-  
-  public int getClientGeneration()
-  {
-	  return clientGeneration_;
-  }
-
-  public ResourceContext getResourceContext()
-  { 
-    return ((BaseEclipseEnvironment) getEnvironment()).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()
-  {
-	if (clientTypeRuntimeServer_ == null) {
-	    String type = getScenarioContext().getClientWebServiceType();
-	    String runtime  = WebServiceRuntimeExtensionUtils2.getDefaultClientRuntimeValueFor(type);
-	    String factoryID = WebServiceRuntimeExtensionUtils2.getDefaultClientServerValueFor(type);
-	    clientTypeRuntimeServer_ = new TypeRuntimeServer();
-	    
-	    clientTypeRuntimeServer_.setTypeId( type );
-	    clientTypeRuntimeServer_.setRuntimeId( runtime );
-	    clientTypeRuntimeServer_.setServerId( factoryID );
-	}
-	
-    return clientTypeRuntimeServer_;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-	  defaultClientScale();
-	  return Status.OK_STATUS;
-  }
-  
-  protected void defaultClientScale() {
-	  clientGeneration_ = getScenarioContext().getGenerateClient();
-	  
-	  if (clientOnly_ && clientGeneration_ == ScenarioContext.WS_NONE) {
-		  developClient_ = true;
-		  assembleClient_ = true;
-		  deployClient_ = true;
-		  clientGeneration_ = ScenarioContext.WS_DEPLOY;
-	  } else {
-		  developClient_ = clientGeneration_ <= ScenarioContext.WS_DEVELOP;
-		  assembleClient_ = clientGeneration_ <= ScenarioContext.WS_ASSEMBLE;
-		  deployClient_ = clientGeneration_ <= ScenarioContext.WS_DEPLOY;
-	  }
-	  installClient_ = clientGeneration_ <= ScenarioContext.WS_INSTALL;
-	  startClient_ = clientGeneration_ <= ScenarioContext.WS_START;
-	  testClient_ = clientGeneration_ <= ScenarioContext.WS_TEST;
-  }
-  
-  public boolean getDevelopClient() {
-	  return developClient_;
-  }
-  
-  public boolean getAssembleClient() {
-	  return assembleClient_;
-  }
-  
-  public boolean getDeployClient() {
-	  return deployClient_;
-  }
-  
-  public boolean getStartClient() {
-	  return startClient_;
-  }
-  
-  public boolean getTestClient() {
-	  return testClient_;
-  }
-  
-}
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 35511e1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,180 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.commands.ExecutionException;
-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.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_;
-  
-  private String webServiceURI_;
-  private IProject project_;
-  private String componentName_;
-  private boolean runTestClient_;
-  private boolean developClient_;
-  private boolean assembleClient_;
-  private boolean deployClient_;
-  private boolean startClient_;
-  private boolean testClient_; 
-  
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-
-  public void setTestService( boolean testService )
-  {
-    testService_ = testService;  
-  }
-  
-  public boolean getRunTestClient()
-  {
-    return runTestClient_;
-  }
-
-  public void setRunTestClient( boolean runTestClient )
-  {
-    runTestClient_ = runTestClient;  
-  }
-  
-  public void setInstallClient( boolean installClient)
-  {
-    installClient_ = installClient;  
-  }
-  
-  public boolean getInstallClient()
-  {
-	return installClient_;  
-  }
-  
-  public boolean getDevelopClient() {
-		return developClient_;
-	}
-
-	public void setDevelopClient(boolean developClient) {
-		this.developClient_ = developClient;
-	}	
-	
-	public boolean getAssembleClient() {
-		return assembleClient_;
-	}
-
-	public void setAssembleClient(boolean assembleClient) {
-		this.assembleClient_ = assembleClient;
-	}
-	
-	public boolean getDeployClient() {
-		return deployClient_;
-	}
-
-	public void setDeployClient(boolean deployClient) {
-		this.deployClient_ = deployClient;
-	}
-	
-	public boolean getStartClient() {
-		return startClient_;
-	}
-
-	public void setStartClient(boolean startClient) {
-		this.startClient_ = startClient;
-	}
-	
-	public boolean getTestClient() {
-		return testClient_;
-	}
-
-	public void setTestClient(boolean testClient) {
-		this.testClient_ = testClient;
-	}
-  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;
-  }
-  
-  public String getWsdlURI()
-  {
-      return webServiceURI_ ;
-  }
-  
-  public void setWsdlURI(String uri)
-  {
-      webServiceURI_ = uri;
-  }
-  
-  public void setProject(IProject project)
-  {
-      project_ = project;
-  }
-  
-  public IProject getProject()
-  {
-      return project_;
-  }
-  
-  public void setComponentName(String name)
-  {
-      componentName_ = name;
-  } 
-  
-  public String getComponentName()
-  {
-      return componentName_ ;
-  }
-}
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 c615cce..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,637 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- * 20060426   135614 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.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.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerServiceRefHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.core.common.StatusUtils;
-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 String outputLocation_;
-  private Composite webServiceRefComp_;
-  private Combo webServiceRefCombo_;
-  private Text webServiceDescText_ = null;
-  private Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Composite sourceLocationComp_;
-  private Combo sourceLocationCombo_;
-
-  private HandlerServiceRefHolder[] handlerServiceRefHolder_;
-  private HandlerServiceRefHolder currentHSRH_;
-  private Hashtable pathsTable_ = new Hashtable();
-  private boolean isMultipleSelection_ = false;
-  private boolean isGenSkeletonEnabled_;
-  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
-    webServiceRefComp_ = uiUtils.createComposite(parent_, 2);
-
-    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 muGriddata = new GridData();
-    Point musize = moveUpButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 mdGriddata = new GridData();
-    Point mdsize = moveDownButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 addGriddata = new GridData(); 
-    Point addSize = addButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 remGriddata = new GridData();
-    Point remSize = removeButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    // set the width to the max of the button labels
-    int widthHint = 0;
-    int[] sizes = new int[]{musize.x, mdsize.x, addSize.x, remSize.x, 100};
-    for(int j = 0; j < sizes.length; j++) {
-    	if (sizes[j] > widthHint)
-    	widthHint = sizes[j];
-    }
-    muGriddata.widthHint = widthHint;
-    mdGriddata.widthHint = widthHint;
-    addGriddata.widthHint = widthHint;
-    remGriddata.widthHint = widthHint;
-    
-    moveUpButton.setLayoutData(muGriddata);
-    moveDownButton.setLayoutData(mdGriddata);
-    addButton_.setLayoutData(addGriddata);
-    removeButton_.setLayoutData(remGriddata);
-    
-    // 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
-    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 {
-      UIUtils uiUtils = new UIUtils(pluginId_);
-
-      // process for multiple service selection
-      if (isMultipleSelection_) {
-        webServiceDescText_ = uiUtils.createText(webServiceRefComp_, ConsumptionUIMessages.LABEL_COMBO_WS_CLIENT_REF, 
-            ConsumptionUIMessages.TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF, SWT.READ_ONLY);
-        if (handlerServiceRefHolder_!=null){
-          currentHSRH_ = handlerServiceRefHolder_[0];
-          String text = NLS.bind(ConsumptionUIMessages.MSG_TEXT_NUM_OF_CLIENTS, Integer.toString(handlerServiceRefHolder_.length));          
-          webServiceDescText_.setText(text);
-        }
-        
-        genSkeletonRadioButton_.setSelection(false);
-        genSkeletonRadioButton_.setEnabled(false);
-        genSkeletonRadioButton_.setVisible(false);
-        
-        sourceLocationComp_.setVisible(false);
-        sourceLocationCombo_.setEnabled(false);
-        sourceLocationCombo_.setVisible(false);
-        
-        refresh();
-
-      }
-      else {
-        
-        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);
-          }
-        });
-
-        String[] wsRefNames = HandlerServiceRefHelper.getAllServiceRefNames(handlerServiceRefHolder_); 
-        webServiceRefCombo_.setItems(wsRefNames);
-  
-        if (handlerServiceRefHolder_.length < 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);
-        }
-        
-        // set handler table
-        HandlerServiceRefHolder hsrh = HandlerServiceRefHelper.getForServiceRefName(handlerServiceRefHolder_, webServiceRefCombo_.getText());
-        if (hsrh != null) {
-          currentHSRH_ = hsrh;
-          List handlers = hsrh.getHandlerList();
-          tableViewer_.setInput(handlers);
-          tableViewer_.refresh();
-        }
-        
-        // set output folder
-        setSourceOutputLocation();
-      }
-      parent_.getShell().setSize(530, 650);
-    }
-    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;
-    if (isMultipleSelection_)
-      return StatusUtils.infoStatus(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_CLIENTS_CONFIG);
-    return finalStatus;
-  }
-
-  protected void handleAddButtonSelected(SelectionEvent event) {
-
-    AddHandlerDialog 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);
-      
-      ServiceRef serviceRef = currentHSRH_.getServiceRef();
-      hi.setWsDescRef(serviceRef);
-      currentHSRH_.getHandlerList().add(hi);
-    }
-
-    refresh();
-  }
-
-  protected void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  protected void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index > 0) {
-        if (currentHSRH_!=null) {
-          List handlers = currentHSRH_.getHandlerList();
-          Object object = handlers.remove(index);
-          handlers.add( index - 1, object);
-          tableViewer_.refresh();
-        }
-      }
-    }
-
-  }
-
-  protected void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (currentHSRH_!=null){
-        List handlers = currentHSRH_.getHandlerList();
-        if (index < handlers.size() - 1) {
-          Object object = handlers.remove(index);
-          handlers.add(index + 1, object);
-          tableViewer_.refresh();
-        }
-      }
-    }
-
-  }
-
-  protected void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    currentHSRH_.setSourceOutputPath(outputPath);
-  }
-
-  protected void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection()) {
-        this.isGenSkeletonEnabled_ = true;
-        sourceLocationCombo_.setEnabled(true);
-      }
-      else {
-        this.isGenSkeletonEnabled_ = false;
-        sourceLocationCombo_.setEnabled(false);
-      }
-    }
-  }
-
-  protected void handleWebServiceRefCombo(SelectionEvent event) {
-
-    if (webServiceRefCombo_!=null && webServiceRefCombo_.isEnabled()) {
-      HandlerServiceRefHolder hsrh = HandlerServiceRefHelper.getForServiceRefName(handlerServiceRefHolder_, webServiceRefCombo_.getText());
-      currentHSRH_ = hsrh;      
-      refresh();
-    }
-    
-    if (isGenSkeletonEnabled_){
-      setSourceOutputLocation();
-    }
-    
-  }
-
-  /**
-   * @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;
-    }
-  }
-
-  protected void handleDeleteKeyPressed() {
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-      if (currentHSRH_!=null){
-        currentHSRH_.getHandlerList().remove(selectionIndex);
-      }
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    
-    try {
-      tableViewer_.setInput(null);
-      if (currentHSRH_!=null){
-        List handlers = currentHSRH_.getHandlerList();
-        tableViewer_.setInput(handlers);
-        tableViewer_.refresh();        
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-    
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  private void setSourceOutputLocation(){
-    if (currentHSRH_!=null){    
-      IProject project = currentHSRH_.getProject();
-      if (project!=null){
-        IPath[]locations = ResourceUtils.getAllJavaSourceLocations(project);
-        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);        
-      }
-      
-      // set in model
-      outputLocation_ = sourceLocationCombo_.getText();
-      IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-      currentHSRH_.setSourceOutputPath(outputPath);      
-    }
-  }
-  
-  /**
-   * Called at the beginning 
-   */
-  public void internalize(){
-    populateHandlersTable();
-  } 
-  
-  /**
-   * Initial selection
-   * @param wsRefName
-   */
-  public void setServiceRefName(String wsRefName) {
-    serviceRefName_ = wsRefName;
-  }
-
-  /**
-   * true if multiple clients are selected
-   * @param isMulitpleSelection
-   */
-  public void setIsMultipleSelection(boolean isMulitpleSelection) {
-    this.isMultipleSelection_ = isMulitpleSelection;
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public void setHandlerServiceRefHolder(HandlerServiceRefHolder[] handlerHolders){
-    this.handlerServiceRefHolder_ = handlerHolders;
-  }
-  
-  public HandlerServiceRefHolder[] getHandlerServiceRefHolder(){
-    return this.handlerServiceRefHolder_;
-  }
-  
-}
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 37b15ea..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,685 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- * 20060426   135614 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060529   143518 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.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.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-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.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.core.common.StatusUtils;
-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 Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Composite webServiceDescComp_;
-  private Combo webServiceDescCombo_ = null;
-  private Text webServiceDescText_ = null;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Composite sourceLocationComp_;
-  private Combo sourceLocationCombo_;
-  
-  private HandlerDescriptionHolder[] handlerDescriptionHolder_;
-  private HandlerDescriptionHolder currentHDH_;
-  private Hashtable pathsTable_ = new Hashtable();  // available paths for combo  
-  private String outputLocation_;                   // selected path from combo
-  private String descriptionName_ = null;
-  private boolean isMultipleSelection_ = false;
-  private boolean isGenSkeletonEnabled_;
-
-  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;
-
-    // Web service description composite (combo/text to be created later)
-    webServiceDescComp_ = uiUtils.createComposite(parent_, 2);
-    
-    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 muGriddata = new GridData();
-    Point musize = moveUpButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 mdGriddata = new GridData();
-    Point mdsize = moveDownButton.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 addGriddata = new GridData(); 
-    Point addSize = addButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    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 remGriddata = new GridData();
-    Point remSize = removeButton_.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    int widthHint = 0;
-    int[] sizes = new int[]{musize.x, mdsize.x, addSize.x, remSize.x, 100};
-    for(int j = 0; j < sizes.length; j++) {
-    	if (sizes[j] > widthHint)
-    	widthHint = sizes[j];
-    }
-    muGriddata.widthHint = widthHint;
-    mdGriddata.widthHint = widthHint;
-    addGriddata.widthHint = widthHint;
-    remGriddata.widthHint = widthHint;
-    
-    moveUpButton.setLayoutData(muGriddata);
-    moveDownButton.setLayoutData(mdGriddata);
-    addButton_.setLayoutData(addGriddata);
-    removeButton_.setLayoutData(remGriddata);
-    
-    // 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();
-      }
-    });
-
-    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 and only for single service selection 
-  private void populateHandlersTable() {
-    try {
-      UIUtils uiUtils = new UIUtils(pluginId_);
-     
-      // process for multiple service selection
-      if (isMultipleSelection_) {
-        parent_.getShell().setText(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_SERVICES_CONFIG);
-        
-        webServiceDescText_ = uiUtils.createText(webServiceDescComp_, ConsumptionUIMessages.LABEL_COMBO_WS_SERVICE_DESC, 
-            ConsumptionUIMessages.TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC, SWT.READ_ONLY);
-        if (handlerDescriptionHolder_!=null){
-          currentHDH_ = handlerDescriptionHolder_[0];
-          String text = NLS.bind(ConsumptionUIMessages.MSG_TEXT_NUM_OF_SERVICES, Integer.toString(handlerDescriptionHolder_.length));
-          webServiceDescText_.setText(text);
-        }
-                
-        genSkeletonRadioButton_.setSelection(false);
-        genSkeletonRadioButton_.setEnabled(false);
-        genSkeletonRadioButton_.setVisible(false);
-        
-        sourceLocationComp_.setVisible(false);
-        sourceLocationCombo_.setEnabled(false);
-        sourceLocationCombo_.setVisible(false);
-        
-        refresh();
-
-      }
-      else {
-        // populate the table for a single service selection
-        
-        webServiceDescCombo_ = uiUtils.createCombo(webServiceDescComp_, 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);
-          }
-        });
-        
-        String[] wsDescNames = HandlerDescriptionHelper.getAllDescriptionNames(handlerDescriptionHolder_);
-        webServiceDescCombo_.setItems(wsDescNames);
-
-        if (handlerDescriptionHolder_.length < 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);
-        }
-        
-        // set Descriptions
-        HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, webServiceDescCombo_.getText());
-        if (hdh!=null){
-          currentHDH_ = hdh;
-          List handlers = hdh.getHandlerList();
-          tableViewer_.setInput(handlers);
-          tableViewer_.refresh();
-        }
-        // set output folder
-        setSourceOutputLocation();  
-      }
-      parent_.getShell().setSize(530, 650);
-    }
-    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;
-    if (isMultipleSelection_)
-      return StatusUtils.infoStatus(ConsumptionUIMessages.PAGE_DESC_MULTIPLE_SERVICES_CONFIG);
-    return finalStatus;
-  }
-
-  protected void handleAddButtonSelected(SelectionEvent event) {
-    AddHandlerDialog dialog = new AddHandlerDialog(parent_.getShell(), false);
-    dialog.setIsMultipleServices(isMultipleSelection_);
-    dialog.create();
-    
-    WebServiceDescription serviceDesc = null;
-    if (!isMultipleSelection_ ){
-      if (currentHDH_!=null) {
-        serviceDesc =  currentHDH_.getDescriptionObject();
-        String[] portNames = getPortComponentNames(serviceDesc);
-        dialog.setPortNames(portNames);
-      }
-    }
-
-    dialog.getShell().setSize(500, 230);
-    
-    int result = dialog.open();
-
-    if (result == Window.OK) {
-      String name = dialog.getName();
-      String className = dialog.getClassName();
-      String port = dialog.getPortName();
-      if (port == null)
-        port = "*";
-
-      HandlerTableItem hi = new HandlerTableItem();
-      hi.setHandlerName(name);
-      hi.setHandlerClassName(className);
-      hi.setPortName(port);
-
-      if (serviceDesc!=null){
-        hi.setWsDescRef(serviceDesc);
-      }
-      
-      if (currentHDH_!=null){
-        List handlers = currentHDH_.getHandlerList();
-        handlers.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];
-  }
-
-  protected void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  protected void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index > 0) {
-        if (currentHDH_!=null){
-            List handlers = currentHDH_.getHandlerList();
-            Object object = handlers.remove(index);
-            handlers.add(index - 1, object);
-          }
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  protected void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (currentHDH_!=null){
-        List handlers = currentHDH_.getHandlerList();
-        if (index < handlers.size() - 1) {
-          Object object = handlers.remove(index);
-          handlers.add(index+1, object);
-        }
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  protected void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    currentHDH_.setSourceOutputPath(outputPath);    
-  }
-
-  protected void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection()) {
-        this.isGenSkeletonEnabled_ = true;
-        sourceLocationCombo_.setEnabled(true);
-      }
-      else {
-        this.isGenSkeletonEnabled_ = false;
-        sourceLocationCombo_.setEnabled(false);
-      }
-    }
-  }
-
-  protected void handleWebServiceDescCombo(SelectionEvent event) {
-
-    if (webServiceDescCombo_!=null && webServiceDescCombo_.isEnabled()) {
-      HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, webServiceDescCombo_.getText());
-      currentHDH_ = hdh;      
-      refresh();
-    }
-    
-    if (isGenSkeletonEnabled_){
-      setSourceOutputLocation();
-    }
-    
-  }
-
-  /**
-   * @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;
-    }
-  }
-
-  protected void handleDeleteKeyPressed() {
-    // internalDispose();
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-      if (currentHDH_!=null){
-        currentHDH_.getHandlerList().remove(selectionIndex);
-      }
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    try {
-      tableViewer_.setInput(null);
-      if (currentHDH_!=null){
-        List handlers = currentHDH_.getHandlerList();
-        tableViewer_.setInput(handlers);
-        tableViewer_.refresh();        
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  private void setSourceOutputLocation(){
-    IProject project = currentHDH_.getProject();
-    if (project!=null){
-      IPath[] locations = ResourceUtils.getAllJavaSourceLocations(project);
-      
-      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);
-    }
-    
-    // set in model
-    outputLocation_ = sourceLocationCombo_.getText();
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    currentHDH_.setSourceOutputPath(outputPath);  
-    
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] handlerHolders){
-    this.handlerDescriptionHolder_ = handlerHolders;
-  }
-  
-  public HandlerDescriptionHolder[] getHandlerDescriptionHolders(){
-    return this.handlerDescriptionHolder_;
-  }
-  
-  /**
-   * For getting the handlers to apply for multiple services
-   * @return
-   */
-  public List getHandlersList(){
-    if (handlerDescriptionHolder_[0]!=null)
-      return handlerDescriptionHolder_[0].getHandlerList();
-    return null;
-  }
-  
-  public void setDescriptionName(String wsDescName) {
-    descriptionName_ = wsDescName;
-  }
-
-  public void setIsMultipleSelection(boolean isMulitpleSelection) {
-    this.isMultipleSelection_ = isMulitpleSelection;
-  }
-
-  public void internalize(){
-    populateHandlersTable();
-  }
-
-}
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 44a2129..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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_;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java
deleted file mode 100644
index c59ad6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IObjectSelectionLaunchable.java
+++ /dev/null
@@ -1,93 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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.swt.widgets.Shell;
-
-public interface IObjectSelectionLaunchable {
-	  /**
-	   * 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();
-	  
-	  /**
-	   * Called to launch a dialog which allows the user to make an object selection.
-	   * This is an alternative to implementing IObjectSelectionWidget which can be used by the dialog framework.
-	   * The implementation of this method should call the necessary getters on the dialog to update the 
-	   * object selection. 
-	   * 
-	   * @return the status of completing the dialog launch
-	   */
-	  public int launch(Shell shell);
-	  
-	  /**
-	   * 
-	   * @return returns the string to displayed in the UI for the selected object
-	   */
-	  public  String getObjectSelectionDisplayableString();
-	  
-	  /**
-	   * 
-	   * @param s A string representation of the object selection
-	   * @return true if the string represents a valid object selection.
-       *  The implementation of this method should set the widget object selection
-	   *  according to the input string so that a subsequent call to getObjectSelection
-	   *  will retrieve the correct object.
-	   */  
-	  public boolean validate(String s);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java
deleted file mode 100644
index 5600bd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/IPackable.java
+++ /dev/null
@@ -1,26 +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
- * -------- -------- -----------------------------------------------------------
- * 20060829   155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-/**
- * An interface that marks an UI element as having some custom packing code.
- */
-public interface IPackable {
-	
-	/**
-	 * Calling this method should cause the UI element to pack itself.  Note that
-	 * this does not necessarily have the same behavior as the pack() method in SWT.
-	 */
-	void packIt();
-}
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 6c7b19d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080501   229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- *******************************************************************************/
-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().toLowerCase().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 file = (IFile) object;
-          String ext = file.getFileExtension();
-          if (ext != null) {
-	          if (ext.equalsIgnoreCase("wsdl"))
-	        	  list.add(file.getFullPath().toString());
-	          else if (ext.equalsIgnoreCase("wsil"))
-	        	  wsil_.setText(file.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;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java
deleted file mode 100644
index 8b36f4d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/JavaBeanSelectionLaunchable.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- * 20060719   149352 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060826   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20070313   170126 makandre@ca.ibm.com - Andrew Mak, BUJava scenario doesn't catch improper service definition
- * 20080310   222075 makandre@ca.ibm.com - Andrew Mak, Cannot launch Web Service wizard on an IType
- * 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.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.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-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.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionLaunchable extends AbstractObjectSelectionLaunchable {
-
-	  private IProject           serverProject_ = null;
-	  private String             serverComponentName_ = null;	  
-	  private String beanClassString_="";
-	  private IStatus validationStatus;
-		   
-	  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 IType)
-	    	setBeanClass((IType) object);
-	      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);
-	      else if (object instanceof String)
-	    	beanClassString_ = (String) object; // use for displayable string
-	    }
-	  }
-
-	 public IStructuredSelection getObjectSelection()
-	  {		 
-	    return new StructuredSelection(beanClassString_);
-	  }
-	  
-	  public IProject getProject()
-	  {
-	    return serverProject_;
-	  }
-
-	  public String getComponentName()
-	  {
-	    return serverComponentName_;
-	  }
-
-	public int launch(Shell shell) {		
-		   
-		    IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-		    return setBeanClass(itype);
-	}
-		  	
-	private int setBeanClass(IType itype) {
-		    if (itype != null)
-		    {
-		       beanClassString_ = itype.getFullyQualifiedName();
-		      try
-		      {
-		        IResource res = itype.getUnderlyingResource();
-		        if (res != null)
-		        {
-		          serverProject_ = res.getProject();
-		          IVirtualComponent comp = ResourceUtils.getComponentOf(res);
-		          if (comp!=null)
-		          {
-		            serverComponentName_ = comp.getName();
-		          }
-		        }
-		        else
-		        {
-		          serverProject_ = null;
-		          serverComponentName_ = null;
-		        }
-		        return Status.OK;
-		      }
-		      catch (JavaModelException jme)
-		      {
-		        serverProject_ = null;
-		        serverComponentName_ = null;
-		        return Status.ERROR;
-		      }
-		    }			    
-		return Status.CANCEL;
-	}	
-  	
-	  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('.') );
-	        }
-	        
-	        beanClassString_ = 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;
-	      	beanClassString_ = pci.getServiceEndpointInterface();	      	
-	      }
-	    }
-	  }
-	  
-	  private void setBeanClass(BeanLink serviceImpl)
-	  {
-	    if( serviceImpl != null )
-	    {
-	      EObject eObject = serviceImpl.eContainer();
-	      if(eObject instanceof ServiceImplBeanImpl){
-	      	setBeanClass((ServiceImplBeanImpl)eObject);
-	      }
-	    }
-	  }
-	  
-	  public IStatus getStatus()
-	  {
-		if (beanClassString_.length() <= 0)
-	    {
-	      return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_BEAN_CANNOT_BE_EMPTY);
-	    }
-	    return Status.OK_STATUS;
-	  }
-	  
-	  public IStatus validateSelection(IStructuredSelection objectSelection)
-	  {
-		if (validationStatus == null)
-			return Status.OK_STATUS;
-		
-		return validationStatus;
-	  }
-	  
-	  public String getObjectSelectionDisplayableString() {		  
-			  return beanClassString_;
-	  }
-	  
-	  public boolean validate(String s) {
-		  beanClassString_ = s;
-		  String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
-		  String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
-		  validationStatus = JavaConventions.validateJavaTypeName(s, sourceLevel, complianceLevel);
-		  return validationStatus.isOK();
-	  }
-
-}
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 82c4649..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/ProjectSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java
deleted file mode 100644
index bb43ca1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ProjectSelectionDialog.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060802   148731 mahutch@ca.ibm.com - Mark Hutchinson
- * 20080603   234251 pmoogk@ca.ibm.com - Peter Moogk, Updated the size of project selection dialog
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleDialog;
-
-public class ProjectSelectionDialog extends SimpleDialog {
-
-	String titleText_="";
-	String projectName_="";
-	String earProjectName_="";
-	String componentType_="";
-	TypeRuntimeServer trs_;
-	boolean needEAR_;
-	
-	public ProjectSelectionDialog(Shell shell, PageInfo pageInfo)
-	{
-		super(shell, pageInfo);
-		titleText_ = pageInfo.getPageName();
-	}	
-	
-	protected void callSetters() {
-		// TODO Auto-generated method stub
-		ProjectSelectionWidget projWidget = (ProjectSelectionWidget)getWidget();		
-		projWidget.setEarProjectName(earProjectName_);
-		projWidget.setProjectName(projectName_);
-		projWidget.setComponentType(componentType_);
-		projWidget.setNeedEAR(needEAR_);
-		projWidget.setTypeRuntimeServer(trs_);
-		
-		projWidget.refreshProjectItems();
-	}
-	
-	  protected Point getInitialSize()
-	  {
-	    return this.getShell().computeSize(325, SWT.DEFAULT, true); 
-	  }
-
-
-	  protected void setShellStyle(int newShellStyle)
-	  {
-	    super.setShellStyle( newShellStyle | SWT.RESIZE );  
-	  }
-
-	  protected void configureShell(Shell newShell)
-	  {
-	    newShell.setText(titleText_);   
-	    super.configureShell(newShell);
-	  }	
-		
-		public void setProjectName(String name)
-		  {
-				projectName_ = name;
-		  }
-		
-		public String getProjectName()
-		  {
-				return projectName_;
-		  }
-		
-		 public void setEarProjectName(String name)
-		  {			
-				earProjectName_ = name;
-		  } 
-		 
-		 public String getEarProjectName()
-		 {
-			 return earProjectName_;
-		 }
-		 
-		 public void setProjectComponentType( String type )
-		  {
-			    componentType_ = type;
-		  }
-
-		 public String getProjectComponentType()
-		  {
-			 return componentType_;
-		  }
-		 
-		 public void setNeedEAR(boolean b)
-		  {
-			    needEAR_ = b;			    
-		  }
-		 
-		 public boolean getNeedEAR()
-		  {
-			    return needEAR_;				
-		  }
-		 
-		 public void setTypeRuntimeServer(TypeRuntimeServer trs)
-		 {
-			    trs_ = trs; 
-		 }
-		 
-		 public boolean close() {
-
-			projectName_ = ((ProjectSelectionWidget)getWidget()).getProjectName();
-			earProjectName_ = ((ProjectSelectionWidget)getWidget()).getEarProjectName(); 
-			needEAR_ = ((ProjectSelectionWidget)getWidget()).getNeedEAR();
-			componentType_ = ((ProjectSelectionWidget)getWidget()).getComponentType();
-			return super.close();
-		}
-}
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 f81138e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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;
-  }
-}
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 5b74d45..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080430   214624 makandre@ca.ibm.com - Andrew Mak, Remove favourite UDDI registries from Web Service Publish page
- *******************************************************************************/
-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.ui.uddi.PrivateUDDIRegistryType;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-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 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);
-    initPrivateUDDI();
-    return this;
-  }
-
-  private void initPrivateUDDI()
-  {
-    if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
-      launchPrivateUDDICheckbox_.setEnabled(false);
-  }
-
-  private void handleSelectionEvent(Event event)
-  {
-    statusListener.handleEvent(event);
-  }
-
-  public void setPublishToPublicUDDI(boolean publish)
-  {
-    launchUDDICheckbox_.setSelection(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())
-    {
-      launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, ""));
-      launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, ""));
-    }
-    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]);
-  }
-}
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 beeab2f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,376 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404   134913 sengpl@ca.ibm.com - Seng Phung-Lu   
- * 20060517   142027 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060518   142554 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-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.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.common.HandlerDescriptionHolder;
-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 WsddResource[] wsddResource_ = null;
-  private IProject project_;
-  private String descriptionName_ = null;
-  private String errorStatusMsg_ = null;
-  private boolean isMultipleSelection_;
-  private HandlerDescriptionHolder[] handlerDescriptionHolder_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    else if (selection.size()>1){
-    	status = processMultipleHandlers(env);
-    	return status;
-    }
-
-    status = processHandlers(env);
-    return status;
-
-  }
-
-  public IStatus processHandlers(IEnvironment env) {
-    try {
-      WebServicesManager webServicesManager = new WebServicesManager();
-      List allWSDLServices = webServicesManager.getAllWSDLServices();
-      int servicesSize = allWSDLServices.size();
-
-      wsddResource_= new WsddResource[servicesSize];
-      wsddResource_[0] = getWsddResourceFromSelection();
-      if (wsddResource_[0] == null) {
-          return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_WSDD_NOT_FOUND);
-      }
-     
-      // check for another wsddResource of another J2EE level
-      int x = 0;
-      while (x<servicesSize) {
-        Service service = (Service )allWSDLServices.get(x);
-        WsddResource wsddRes = webServicesManager.getWsddResource(service);
-        boolean isUniqueWsdd = true;
-        for (int w=0;w<wsddResource_.length;w++){
-        	if (wsddRes.equals(wsddResource_[w])){
-        		isUniqueWsdd = false;
-        		break;
-        	}
-        }
-        
-        if (isUniqueWsdd) {
-          wsddResource_[x] = wsddRes;
-        }
-        x++;
-      }
-
-      // determine total # for descriptions
-      handlerDescriptionHolder_ = new HandlerDescriptionHolder[getNumberofServices(wsddResource_)];
-      
-      int descCounter = 0;
-      for (int y=0;y<wsddResource_.length;y++) {
-        if (wsddResource_[y] !=null) {
-	        WebServices webServices = wsddResource_[y].getWebServices();
-	        if (webServices != null) {
-	          List wsDescriptions = webServices.getWebServiceDescriptions();
-	          for (int i = 0; i < wsDescriptions.size() ; i++) {
-	 
-	            WebServiceDescription wsDescription = (WebServiceDescription) wsDescriptions.get(i);
-	            Vector handlers = new Vector();  
-	            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();
-	     
-	              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);
-	                
-	                handlers.add(handlerItem);
-	              }
-	            }
-	            String wsDescName = wsDescription.getWebServiceDescriptionName();
-	            handlerDescriptionHolder_[descCounter] = new HandlerDescriptionHolder();
-	            handlerDescriptionHolder_[descCounter].setHandlerList(handlers);
-	            handlerDescriptionHolder_[descCounter].setDescriptionObject(wsDescription);
-	            handlerDescriptionHolder_[descCounter].setDescriptionName(wsDescName);
-	            descCounter++;
-	          }
-	        }
-	      }
-      }
-
-      if (handlerDescriptionHolder_ == null){
-          //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;
-  }
-
-  /**
-   * For processing multiple service selection; only prepare table of service description names
-   * description objects will be processed later by the output command 
-   * @param env
-   * @return
-   */
-  private IStatus processMultipleHandlers(IEnvironment env){
-
-	  Service[] services = getSelectedServices();
-      if (errorStatusMsg_ != null){
-    	  return StatusUtils.errorStatus(errorStatusMsg_);
-      }
-      isMultipleSelection_ = true;
-
-      handlerDescriptionHolder_ = new HandlerDescriptionHolder[services.length];
-      Vector handlers = new Vector();
-      for (int i=0;i<services.length;i++){
-        
-        String descName = services[i].getQName().getLocalPart();
-        WebServiceDescription wsDescription = getServiceDescription(services[i], descName);
-        handlerDescriptionHolder_[i] = new HandlerDescriptionHolder();
-        handlerDescriptionHolder_[i].setHandlerList(handlers);
-        handlerDescriptionHolder_[i].setDescriptionName(descName);
-        handlerDescriptionHolder_[i].setDescriptionObject(wsDescription);
-      }
-      return Status.OK_STATUS;
-  }
-  
-  /**
-   * Matches the serviceName with the ServiceDescriptionName to get the WebServiceDescription
-   * @param service
-   * @param serviceName
-   * @return
-   */
-  private WebServiceDescription getServiceDescription(Service service, String serviceName){
-    WebServicesManager webServicesManager = new WebServicesManager();
-    WsddResource wsddResource = webServicesManager.getWsddResource(service);
-    if (wsddResource!=null) {
-      WebServices services = wsddResource.getWebServices();
-      if (services!=null) {
-        List descriptions  = services.getWebServiceDescriptions();
-        for (int i=0;i<descriptions.size();i++){
-          WebServiceDescription wsd = (WebServiceDescription)descriptions.get(i);
-          if (wsd!=null && wsd.getWebServiceDescriptionName().equals(serviceName)){
-            return wsd;
-          }
-        }
-      }
-    }
-    return null;
-  }
-  
-  public boolean getIsMultipleSelection(){
-	  return this.isMultipleSelection_;
-  }
-  
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    if (isMultipleSelection_)
-      return false;
-    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;
-  }
-
-  /**
-   * Gets the WsddResource
-   * @return
-   */
-  public WsddResource[] getWsddResource() {
-    return wsddResource_;
-  }
-
-  private WsddResource getWsddResourceFromSelection() {
-    WebServicesManager webServicesManager = new WebServicesManager();
-
-    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;
-          WebServices webServices = wsddRes.getWebServices();
-          if (webServices != null) {
-            List wsDescriptions = webServices.getWebServiceDescriptions();
-            if (wsDescriptions!=null) {
-              WebServiceDescription wsd = (WebServiceDescription)wsDescriptions.get(0);
-              descriptionName_ = wsd.getWebServiceDescriptionName();
-            }
-          }
-    	  project_ = ProjectUtilities.getProject(res);
-    	  return wsddRes;
-      }
-    }
-    
-    return null;
-
-  }
-  
-  /**
-   * Get total number of ServiceDescriptions given 14 and 13 services
-   * @param wsddRes
-   * @return
-   */
-  private int getNumberofServices(WsddResource[] wsddRes){
-    int num= 0;
-    for (int i=0;i<wsddRes.length;i++){
-    	if (wsddRes[i]!=null) {
-    		WebServices ws = wsddRes[i].getWebServices();
-    		if (ws!=null){
-    			num += ws.getWebServiceDescriptions().size();
-    		}
-    	}
-    }
-    return num;
-    
-  }
-
-  /**
-   * For multiple selection of Services
-   * @return
-   */
-  private Service[] getSelectedServices(){
-	  WebServicesManager wsManager = new WebServicesManager();
-	  IStructuredSelection initSel = getInitialSelection();
-  	  Service[] services = new Service[initSel.size()];
-  	  wsddResource_ = new WsddResource[initSel.size()];
-  	  Iterator iter = initSel.iterator();
-  	  for (int i=0;i<initSel.size();i++) {
-  		  Object obj = iter.next();
-  		  if (obj instanceof Service){
-  			  services[i] = (Service)obj;
-  			  wsddResource_[i] = wsManager.getWsddResource(services[i]);
-  		  }
-  		  else{
-  			  errorStatusMsg_ = ConsumptionUIMessages.MSG_ERROR_INVALID_MULTIPLE_SERVICE_SELECT;
-  			  return null;
-  		  }
-  	  }
-  	  return services;
-  }
-  
-
-  
-  /**
-   * Get Description Name for single Web services selected
-   * null if mulitple services are selected
-   * @return
-   */
-  public String getDescriptionName(){
-    return descriptionName_;
-  }
-  
-  /**
-   * An array of HandlerDescriptionHolders
-   * @return
-   */
-  public HandlerDescriptionHolder[] getHandlerDescriptionHolders(){
-    return handlerDescriptionHolder_;
-  }
-  
-  
-}
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 9ef8c60..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,244 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404   134913 sengpl@ca.ibm.com - Seng Phung-Lu   
- * 20060517   142027 sengpl@ca.ibm.com - Seng Phung-Lu    
- *******************************************************************************/
-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.common.HandlerDescriptionHelper;
-import org.eclipse.jst.ws.internal.consumption.ui.common.HandlerDescriptionHolder;
-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 boolean isMultipleSelection_;
-  private HandlerDescriptionHolder[] handlerDescriptionHolder_;
-
-  /**
-   * For each HandlerDescriptionHolder, the user selected Handlers are
-   * sync'd up with the internal model
-   * For multiple services, handlers are added (not removed) to each port.
-   * 
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-    try {
-      if (isMultipleSelection_){
-        for (int i=0; i<handlerDescriptionHolder_.length;i++){
-           
-          handlerDescriptionHolder_[i].addHandlerToAllPorts();
-        }
-      }
-      else {
-        // add handler(s) for single service selected
-        for (int h=0;h<handlerDescriptionHolder_.length;h++){
-  
-          Hashtable wsPortsTable = new Hashtable();
-          Hashtable wsPortToHandlerTable = new Hashtable();
-  
-          String serviceDescName = handlerDescriptionHolder_[h].getDescriptionName();
-          // load PortName -> PortComponent table
-          HandlerDescriptionHolder hdh = HandlerDescriptionHelper.getForDescriptionName(handlerDescriptionHolder_, serviceDescName);
-          if (hdh!=null) {
-            
-            WebServiceDescription wsDescription_ =  hdh.getDescriptionObject();          
-            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 = hdh.getHandlerList();          
-            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);
-          }
-        }
-      }
-      
-      // save
-      if (wsddResource_ != null) {
-        for (int i=0;i<wsddResource_.length;i++) {
-        	if (wsddResource_[i]!=null)
-        		wsddResource_[i].save(new HashMap());
-        }
-      }
-  
-      }
-    catch (Exception e) {
-      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();
-    }
-  }
-
-  /**
-   * HandlerDescriptionHolder
-   * @param hdhs
-   */
-  public void setHandlerDescriptionHolders(HandlerDescriptionHolder[] hdhs){
-    this.handlerDescriptionHolder_ = hdhs;
-  }
-  
-  public void setIsMultipleSelection(boolean isMulitpleSelection) {
-    this.isMultipleSelection_ = isMulitpleSelection;
-  }
-
-
-  public void setWsddResource(WsddResource[] wsddRes) {
-    this.wsddResource_ = wsddRes;
-  }
-
-}
\ 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 1bc2523..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,630 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060505   139918 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-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.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-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();
-             }
-           }
-         );
-         
-    text_.addFocusListener( new FocusAdapter() 
-                            {
-                              public void focusLost(FocusEvent e)
-                              {
-                                internalRefresh();
-                              }
-                            } );
-    
-	  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/TimedWSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TimedWSDLSelectionConditionCommand.java
deleted file mode 100644
index f56b6e0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TimedWSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,93 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060504   119296 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-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.jface.preference.IPreferenceStore;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.common.Condition;
-import org.eclipse.wst.command.internal.env.ui.common.TimedOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class TimedWSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private final String                  TIMEOUT_PREFERENCE = "wsdlTimeOut";
-  private WSDLSelectionConditionCommand selectionCommand;
-  private int                           timeOutValue;
-  
-  public TimedWSDLSelectionConditionCommand()
-  {
-    selectionCommand = new WSDLSelectionConditionCommand();
-    
-    IPreferenceStore prefStore = WebServiceConsumptionUIPlugin.getInstance().getPreferenceStore();
-    
-    timeOutValue = prefStore.getDefaultString(TIMEOUT_PREFERENCE).equals("") ? 10000 : prefStore.getInt( TIMEOUT_PREFERENCE );
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    selectionCommand.setWebServicesParser( webServicesParser );
-  }
-
-  public WebServicesParser getWebServicesParser()
-  {
-    return selectionCommand.getWebServicesParser();
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    String         timeOutMessage = ConsumptionUIMessages.bind( ConsumptionUIMessages.MSG_INFO_WSDL_OPERATION_TIMED_OUT, getWebServiceURI() );
-    
-    TimedOperation timedOperation = new TimedOperation( selectionCommand, timeOutValue, timeOutMessage );
-    
-    return timedOperation.execute(monitor, adaptable);
-  }
-  
-  public boolean evaluate()
-  {
-    return selectionCommand.evaluate();
-  }
-
-  public String getWebServiceURI()
-  {
-    return selectionCommand.getWebServiceURI();
-  }
-
-  public void setWebServiceURI(String webServiceURI)
-  {
-    selectionCommand.setWebServiceURI(webServiceURI);
-  }
-  
-  public String getWsdlURI()
-  {
-    return getWebServiceURI();
-  }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
-	return selectionCommand.getHttpBasicAuthPassword();
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
-	return selectionCommand.getHttpBasicAuthUsername();
-}
-}
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 bb6049a..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/WSDLSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionDialog.java
deleted file mode 100644
index a24276e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionDialog.java
+++ /dev/null
@@ -1,97 +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
- * -------- -------- -----------------------------------------------------------
- * 20060525   142281 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.AbstractSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-
-public class WSDLSelectionDialog extends AbstractSelectionDialog {
-	
-	private String titleText_;
-	private String wsUri_;
-	private String componentName_;
-	private IProject project_;
-	
-	public WSDLSelectionDialog(Shell parent, PageInfo pageInfo) {
-		super(parent, pageInfo);
-		titleText_ = pageInfo.getPageName();
-	}
-
-	protected void callSetters()
-	{		
-		((WSDLSelectionWidgetWrapper)getWidget()).setComponentName(componentName_);
-		((WSDLSelectionWidgetWrapper)getWidget()).setProject(project_);
-		((WSDLSelectionWidgetWrapper)getWidget()).setWebServiceURI(wsUri_);
-	}
-	
-	public void setComponentName(String componentName)
-	{
-         componentName_ = componentName;      	   
-	}
-	
-	public String getComponentName()
-	{
-         return componentName_ ;      	   
-	}
-	
-	public void setProject(IProject project)
-	{
-		project_ = project;
-	}
-	
-	public void setWebServiceURI(String wsUri)
-	{
-		wsUri_ = wsUri;
-	}	
-	 
-	  protected void setShellStyle(int newShellStyle)
-	  {
-	    super.setShellStyle( newShellStyle | SWT.RESIZE );  
-	  }
-
-	  protected void configureShell(Shell newShell)
-	  {
-	    newShell.setText(titleText_);   
-	    super.configureShell(newShell);
-	  }
-
-	  public String getDisplayableSelectionString() {
-		  
-		 return ((WSDLSelectionWidgetWrapper)getWidget()).getObjectSelectionDisplayableString();
-	}
-	  
-	  public IStructuredSelection getObjectSelection() {
-		  return ((WSDLSelectionWidgetWrapper)getWidget()).getObjectSelection();
-	}
-	 
-	  public String getWebServiceURI()
-	  {
-		  return wsUri_;
-	  }
-	  
-	  public IProject getProject(){
-		  return project_;
-	  }
-
-      public boolean close() {
-        setComponentName(((WSDLSelectionWidgetWrapper)getWidget()).getComponentName());
-        setProject(((WSDLSelectionWidgetWrapper)getWidget()).getProject());
-        setWebServiceURI(((WSDLSelectionWidgetWrapper)getWidget()).getWebServiceURI());
-    	return super.close();
-    }
-}
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 861311e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,138 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-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 );
-      if (env != null)
-      {
-        env.getStatusHandler().reportError(status);
-      }
-      return status;
-    }
-  }
-}
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 28cc163..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060418   136712 joan@ca.ibm.com - Joan Haggarty
- * 20070131   168786 makandre@ca.ibm.com - Andrew Mak, wsdl url on web service wizard page 1 is not reflected in browse dialog
- *******************************************************************************/
-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_;
-  private WebServiceEntity entity_;
-
-  /**
-  * 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;
-  	if (!tree_.isDisposed()) {
-  		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()
-  {	  
-	  	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()
-  {    
-	entity_ = getSelectionAsWebServiceEntity();
-    if (entity_ == null || entity_.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 738e580..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070116   159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070327   172339 kathy@ca.ibm.com - Kathy Chan
- * 20070125   171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070410   181827 kathy@ca.ibm.com - Kathy Chan
- * 20080220   219537 makandre@ca.ibm.com - Andrew Mak
- * 20080501   229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- * 20081208   257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
- * 20090310   242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-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.Path;
-import org.eclipse.core.runtime.Platform;
-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.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.util.UniversalPathTransformer;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection selection_;
-  private String uri_;
-  
-  public String getWebServiceURI()
-  {
-	if (uri_ != null)
-		return uri_;
-	  
-    uri_ = "";
-    
-  	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.equalsIgnoreCase("wsdl") || ext.equalsIgnoreCase("wsil") || ext.equalsIgnoreCase("html")))
-  	    {  	    
-  	      IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
-  	      boolean allowBaseConversionOnFailure = true;
-  	      if (converter != null)
-  	      {
-  	    	  uri_ = converter.convert(ifile);
-  	    	  if (uri_ == null)
-  	    		  allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
-  	    		  
-  	      }
-  	      if ((uri_ == null || uri_.length() == 0) && allowBaseConversionOnFailure)
-  	        uri_ = ifile.getFullPath().toString();
-  	    }
-  	  } 
-  	  else if (Platform.getAdapterManager().hasAdapter(firstSel, WSDLURLStringWrapper.class.getName())) {
-		Object adaptedObject = Platform.getAdapterManager().loadAdapter(firstSel, WSDLURLStringWrapper.class.getName());
-  		WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
-  		uri_ = wrapper.getWSDLURLString();  		
-  	  }
-  	  else if (firstSel instanceof ServiceImpl)
-      {
-        ServiceImpl serviceImpl = (ServiceImpl)firstSel;
-        uri_ = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-      } else if (firstSel instanceof ServiceRef)
-      {
-  	    ServiceRef serviceRef = (ServiceRef)firstSel;
-        uri_ = J2EEActionAdapterFactory.getWSDLURI(serviceRef);
-      } else if (firstSel instanceof WSDLResourceImpl)
-  	  {
-  	    WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
-  	    uri_ = J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
-  	  } else if (firstSel instanceof String)
-  	  {
-  	    uri_ = (String)firstSel;
-  	  } else {
-  		String adaptedUri = AdapterUtils.getAdaptedWSDL(firstSel);
-  		if (adaptedUri != null) {
-  			uri_ = adaptedUri;
-  		}
-  	  }
-  	  
-  	  uri_ = UniversalPathTransformer.toPath(uri_);
-  	}
-    return uri_;
-  }
- 
-  public void setInitialSelection( IStructuredSelection selection )
-  {
-    selection_ = selection;   
-    uri_ = null;
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-  	String wsURI = getWebServiceURI();
-  	if (wsURI != null && wsURI.length() > 0 && wsURI.toLowerCase().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 boolean hasProtocol(String url) {	  
-    return url.indexOf(":") != -1;	  
-  }
-  
-  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) {
-            String uri = getWebServiceURI();
-            if (hasProtocol(uri)) return null;
-            return ResourceUtils.getProjectOf(new Path(uri));
-          }
-          else
-            return ResourceUtils.getProjectOf(resource.getFullPath());
-        } 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);
-          IVirtualComponent comp;
-          if (resource==null) {
-            String uri = getWebServiceURI();
-            if (hasProtocol(uri)) return null;              
-            comp = ResourceUtils.getComponentOf(new Path(uri)) ;
-          }
-          else 
-            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;
-  }    
-     
-}
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 56a9a6a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,144 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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()
-  {
-	  wsdlSelectionWidget = new WSDLSelectionWidget();
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {    
-    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;
-  }
-  
-  public String getObjectSelectionDisplayableString() {
-	  if (wsdlSelectionWidget != null)
-	  {
-		  return wsdlSelectionWidget.getObjectSelectionDisplayableString();  
-	  }
-	  else return ""; 
-  }
-  
-  public IStructuredSelection getObjectSelection() {
-	  return wsdlSelectionWidget.getObjectSelection();
-  }
-  
-  public boolean validate(String s)
-  {
-	  return wsdlSelectionWidget.validate(s);
-  }
-}
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 885f4c7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,1054 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060407   135443 joan@ca.ibm.com - Joan Haggarty
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410   136030 kathy@ca.ibm.com - Kathy Chan
- * 20060411   136167 kathy@ca.ibm.com - Kathy Chan
- * 20060417   136390 joan@ca.ibm.com - Joan Haggarty
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060421   136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424   138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425   137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060426   137622 joan@ca.ibm.com - Joan Haggarty
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20060504   138035 joan@ca.ibm.com - Joan Haggarty
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060607   144826 joan@ca.ibm.com - Joan Haggarty
- * 20060607   144049 joan@ca.ibm.com - Joan Haggarty
- * 20060614   146270 joan@ca.ibm.com - Joan Haggarty
- * 20060717   150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726   150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060817   140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060829   155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20070126   138484 kathy@ca.ibm.com - Kathy Chan
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
- * 20080312   147442 trungha@ca.ibm.com - Trung Ha
- * 20080311   222103 trungha@ca.ibm.com - Trung, Changing service scale doesn't update completely non-UI part of client scale
- * 20080327   224452 trungha@ca.ibm.com - Trung Ha
- * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090121   261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- *******************************************************************************/
-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.resource.ImageRegistry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-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.context.ScenarioContext;
-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.accessibility.Accessible;
-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.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Rectangle;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Scale;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.HyperlinkGroup;
-import org.eclipse.ui.forms.HyperlinkSettings;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-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.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor implements IPackable
-{    
-	 // INFOPOPS	 
-	 /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022";
-	 /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023";
-	 /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */
-     private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS  = "WSWSCEN0024";
-	 /* CONTEXT_ID WSWSCEN0025 for theClient Type combo box of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_COMBO_CLIENTTYPE = "WSWSCEN0025";
-	 /* CONTEXT_ID WSWSCEN0026 for theClient Slider of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_SCALE_CLIENT = "WSWSCEN0026";
-	
-  private String GRAPHIC_CLIENT_0="icons/client_test.jpg";  //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_1="icons/client_run.jpg";   //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_2="icons/client_install.jpg"; //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_3="icons/client_deploy.jpg"; //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_4="icons/client_assemble.jpg"; //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_5="icons/client_develop.jpg";  //$NON-NLS-N$
-  private String GRAPHIC_CLIENT_6="icons/client_none.jpg";  //$NON-NLS-N$
-  
-  private String ICON_SCALE_BG_0="icons/scale0_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_1="icons/scale1_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_2="icons/scale2_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_3="icons/scale3_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_4="icons/scale4_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_5="icons/scale5_bground.jpg";  //$NON-NLS-N$
-  private String ICON_SCALE_BG_6="icons/scale6_bground.jpg";  //$NON-NLS-N$
-  
-  private Composite clientComposite_;
-  private Composite hCompClient_;
-  private Shell shell_;
-  private Combo  clientTypeCombo_;  
-  private Scale clientScale_;  
-  private Label topologySpot_;
-  private Label clientDetailsLabel_;  
-  private Hyperlink hLinkClientRuntime_;
-  private Hyperlink hLinkClientServer_;
-  private Hyperlink hLinkClientProject_;
-  private Hyperlink hLinkClientEAR_;
-  private ProjectSelectionDialog projectDialog_;
-  
-  private boolean developClient_;
-  private boolean assembleClient_;
-  private boolean deployClient_;
-	
-  private Boolean testClient_;
-  private Boolean installClient_;
-  private Boolean startClient_;    
-    
-  private TypeRuntimeServer ids_;
-  private IStructuredSelection objectSelection_;
-  private boolean enableProxy_;  //service scale is set to a level that the client scale can be enabled
-  private boolean clientOnly_=false;
-  private int clientScaleSetting_;
-  private ImageRegistry imageReg_;
-  private IProject project_;
-  private WebServicesParser parser_;
-  private String earProjectName_;
-  private String projectName_;
-  private boolean needEar_;
-  private String clientComponentType_;
-  
-  private Listener statusListener_;
-  private int validationState_;
-  
-  private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
-  
-  private String CLIENT_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ; 
-  private String CLIENT_SERVER_PREFIX =  ConsumptionUIMessages.LABEL_SERVERS_LIST;
-  private String CLIENT_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_CLIENT_PROJECT;
-  private String CLIENT_EAR_PREFIX = ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT;
-  
-  private Composite clientGroupComposite_ ;
-	
-  private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.consumption.ui");
-  private IPackable packable_ = null;  
-  private LabelsAndIds labelIds_;
-  
-  public WebServiceClientTypeWidget(boolean clientOnly) {
-	    clientOnly_ = clientOnly;
-		initImageRegistry();
-		validationState_ = ValidationUtils.VALIDATE_ALL;
-	}
-   
-    /**
-     * Give this widget a handle to an IPackable instance, which will also be
-     * packed when this widget's packIt() is called.
-     * 
-     * @param packable The IPackable instance.
-     */
-    public void setPackable(IPackable packable) {
-    	packable_ = packable;
-    }
-  
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
-	 */
-	public void packIt() {
-		clientGroupComposite_.pack(true);		
-		utils_.horizontalResize(clientGroupComposite_.getShell(), clientGroupComposite_, UIUtils.DEFAULT_PADDING);
-		if (!clientOnly_ && packable_ != null)
-			packable_.packIt();
-	}
-  
-  /* (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)
-  {
-    statusListener_ = statusListener;
-    Composite clientTypeComposite = new Composite(parent, SWT.NONE);
-	GridLayout cclayout = new GridLayout();
-	cclayout.numColumns = 2;
-	cclayout.marginTop=3;
-	clientTypeComposite.setLayout( cclayout );
-    GridData ccGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL); 
-    clientTypeComposite.setLayoutData(ccGridData);
-    
-    int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
-    clientTypeCombo_ = utils_.createCombo( clientTypeComposite, 
-    		ConsumptionUIMessages.LABEL_WEBSERVICECLIENTTYPE,
-    		ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_CLIENTTYPE, 
-    		INFOPOP_WSWSCEN_COMBO_CLIENTTYPE, 
-                                          comboStyle );
-    GridData comboGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    clientTypeCombo_.setLayoutData(comboGridData);
-	clientTypeCombo_.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				String oldTypeId = ids_.getTypeId();
-				int currentSelectionIdx = clientTypeCombo_.getSelectionIndex();
-				String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
-				if (!oldTypeId.equals(currentTypeId)) {		
-					// handle changing client type
-					ids_.setTypeId(currentTypeId);
-					refreshServerRuntimeSelection();
-				}
-				validationState_ = ValidationUtils.VALIDATE_ALL;
-				statusListener_.handleEvent(null);
-			}
-
-		});    
-    
-    clientGroupComposite_ = new Composite(parent, SWT.NONE);    
-	GridLayout gclayout = new GridLayout();
-	gclayout.numColumns = 2;
-	gclayout.horizontalSpacing=0;		
-	gclayout.marginHeight=0;		
-	gclayout.marginBottom=5;
-	clientGroupComposite_.setLayout( gclayout );
-    GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true); 
-    clientGroupComposite_.setLayoutData(gcGridData);
-    
-    clientGroupComposite_.addControlListener(new ControlListener()
-	{
-		public void controlMoved(ControlEvent e) {
-			// TODO Auto-generated method stub
-			
-		}
-		public void controlResized(ControlEvent e) {
-			clientGroupComposite_.pack(true);
-		}
-	});
-    
-       
-	clientComposite_ =  new Composite(clientGroupComposite_, SWT.NONE);
-	GridLayout gridlayout   = new GridLayout();
-    gridlayout.numColumns   = 2;
-    gridlayout.horizontalSpacing=0;
-    gridlayout.marginHeight=0;
-    clientComposite_.setLayout( gridlayout );
-    GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    clientComposite_.setLayoutData(scGridData);
-    
-    clientScale_ = new Scale(clientComposite_ , SWT.VERTICAL | SWT.BORDER);		
-	utils_.createInfoPop(clientScale_, INFOPOP_WSWSCEN_SCALE_CLIENT);	
-	clientScale_.setMinimum(0);
-	clientScale_.setMaximum(6);
-	clientScale_.setIncrement(1);
-	clientScale_.setPageIncrement(1);
-	clientScale_.addSelectionListener(scaleSelectionListener);		
-	setClientScale(getClientGeneration());
-	clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-	
-	Accessible accessibleScale = clientScale_.getAccessible();
-	accessibleScale.addAccessibleListener(new AccessibleAdapter(){
-		// return a string that describes what to do with the slider
-		//  this is read by the screen reader when the slider first gets focus
-		public void getName(AccessibleEvent e) {
-			e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT;			
-		}			
-	});
-	accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){
-		// return a meaningful string when the screen reader
-		// attempts to get the value from the service scale
-		public void getValue(AccessibleControlEvent e) {
-			int selection = clientScale_.getSelection();
-			switch (selection) {
-			case 0:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST;
-				break;
-			case 1:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN;
-				break;
-			case 2:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL;
-				break;
-			case 3:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY;
-				break;
-			case 4:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
-				break;
-			case 5:
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
-				break;
-			case 6:				
-				if (clientOnly_)
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY;
-				else
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT;				
-				break;
-			default:
-				break;
-			}								
-		}
-	});
-	
-	GridData layoutData1 = new GridData();
-	layoutData1.horizontalAlignment=SWT.CENTER;
-	layoutData1.verticalAlignment = SWT.BEGINNING;
-	Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds();	
-	layoutData1.heightHint=scaleR.height;
-	layoutData1.widthHint=scaleR.width+1;
-	clientScale_.setLayoutData(layoutData1);
-		
-	topologySpot_ = new Label(clientComposite_ , SWT.CENTER | SWT.BORDER );
-	topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-	if (clientOnly_)
-		topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY);
-	else
-	topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-	
-	GridData layoutData = new GridData();
-	layoutData.verticalAlignment=SWT.BEGINNING;
-	layoutData.horizontalAlignment=SWT.BEGINNING;
-	Rectangle topR = (imageReg_.get(GRAPHIC_CLIENT_6)).getBounds();
-	layoutData.widthHint=topR.width;
-	layoutData.heightHint=topR.height;
-	topologySpot_.setLayoutData(layoutData);		
-	
-	setGraphics(getClientGeneration());
-		
-	hCompClient_ = utils_.createComposite(clientGroupComposite_, 1);
-	
-	clientDetailsLabel_ = new Label(hCompClient_, SWT.NONE);
-	clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-	
-	hLinkClientServer_= new Hyperlink(hCompClient_, SWT.NULL);
-	utils_.createInfoPop(hLinkClientServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
-	hLinkClientServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
-	hLinkClientServer_.addHyperlinkListener(new IHyperlinkListener(){
-		public void linkActivated(HyperlinkEvent e){			
-			launchRuntimeSelectionDialog(true, true);				
-		}
-		public void linkEntered(HyperlinkEvent e){}
-		public void linkExited(HyperlinkEvent e){}			
-	});
-	
-	hLinkClientRuntime_ = new Hyperlink(hCompClient_, SWT.NULL);
-	utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
-	hLinkClientRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
-	hLinkClientRuntime_.addHyperlinkListener(new IHyperlinkListener(){
-		public void linkActivated(HyperlinkEvent e){			
-			launchRuntimeSelectionDialog(true);
-		}
-		public void linkEntered(HyperlinkEvent e){}
-		public void linkExited(HyperlinkEvent e){}			
-	});
-	
-	IWorkbench workbench = PlatformUI.getWorkbench();
-	projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
-			new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_CLIENT_PROJECT_SETTINGS, "", 
-                    new WidgetContributorFactory()
-						{	
-							public WidgetContributor create()
-							{	  						 
-							   return new ProjectSelectionWidget(true);
-							}
-						}));
-	
-	hLinkClientProject_ = new Hyperlink(hCompClient_, SWT.NULL);
-	utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
-	hLinkClientProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK);
-	hLinkClientProject_.addHyperlinkListener(new IHyperlinkListener(){
-		public void linkActivated(HyperlinkEvent e){			
-			launchProjectDialog();
-		}
-		public void linkEntered(HyperlinkEvent e){}
-		public void linkExited(HyperlinkEvent e){}			
-	});
-	
-	hLinkClientEAR_ = new Hyperlink(hCompClient_, SWT.NULL);	
-	utils_.createInfoPop(hLinkClientRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
-	hLinkClientEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_CLIENTPROJECT_LINK);
-	hLinkClientEAR_.addHyperlinkListener(new IHyperlinkListener(){
-		public void linkActivated(HyperlinkEvent e){			
-			launchProjectDialog();
-		}
-		public void linkEntered(HyperlinkEvent e){}
-		public void linkExited(HyperlinkEvent e){}			
-	});
-	
-	hLinkClientServer_.setText(CLIENT_SERVER_PREFIX); 
-	hLinkClientRuntime_.setText(CLIENT_RUNTIME_PREFIX);
-	hLinkClientProject_.setText(CLIENT_PROJECT_PREFIX);
-	hLinkClientEAR_.setText(CLIENT_EAR_PREFIX);	
-	
-	HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
-	serverRuntimeGroup.add(hLinkClientServer_);
-	serverRuntimeGroup.add(hLinkClientRuntime_);
-	serverRuntimeGroup.add(hLinkClientProject_);
-	serverRuntimeGroup.add(hLinkClientEAR_);
-	serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
-    
-	enableClientSlider(getGenerateProxy());
-	
-    return this;
-  }
-  
-  public void enableClientSlider( boolean enable )
-  {
-	enableProxy_ = enable;
-	clientScale_.setEnabled(enable);
-	int selection = getClientGeneration();
-	if (enable)
-	{				
-		setGraphics(selection);
-	}
-	else
-	{
-		setClientScale(ScenarioContext.WS_NONE);
-		updateFields(ScenarioContext.WS_NONE);
-		setGraphics(ScenarioContext.WS_NONE);
-		clientScale_.setBackgroundImage(null);  //override background for disable to grey		
-	}	
-	showSummary(enable && (selection <= ScenarioContext.WS_DEVELOP));
-  }
-
-  private void updateFields(int selection) {
-		setDevelopClient(selection <= ScenarioContext.WS_DEVELOP);
-		setAssembleClient(selection <= ScenarioContext.WS_ASSEMBLE);
-		setDeployClient(selection <= ScenarioContext.WS_DEPLOY);
-		setTestClient(new Boolean(selection <= ScenarioContext.WS_TEST));
-		setInstallClient(new Boolean(selection <= ScenarioContext.WS_INSTALL));
-		setStartClient(new Boolean(selection <= ScenarioContext.WS_START));
-  }
-
-  private void showSummary(boolean show)
-  {
-	  if (clientOnly_)
-		  show = true;  //short circuit to eliminate flicker...	  
-	  
-	  hLinkClientEAR_.setVisible(show && needEar_);
-	  hLinkClientProject_.setVisible(show);
-	  hLinkClientRuntime_.setVisible(show);
-	  hLinkClientServer_.setVisible(show);
-	  
-	  if (show)
-	  {
-		  clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-	  }
-	  else
-	  {
-		  if (clientOnly_)
-			  hCompClient_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT_ONLY);
-			else
-		  hCompClient_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-		  clientDetailsLabel_.setText(ConsumptionUIMessages.LABEL_SUMMARY_NO_CLIENT);		  
-	  }	  
-	  clientDetailsLabel_.pack(true);
-	  hLinkClientProject_.pack(true);
-	  hLinkClientEAR_.pack(true);
-	  packIt();
-  }
-
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-	LabelsAndIds                 labelIds   = WebServiceRuntimeExtensionUtils2.getClientTypeLabels();
-    int                          selection  = 0;
-    String[]                     clientIds  = labelIds.getIds_();
-    String                       selectedId = ids.getTypeId();
-    
-    labelIds_ = labelIds;
-	// 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;
-	
-	if (ids_ != null)
-	{
-		String clientServerText = "";
-		String serverId = ids_.getServerId();
-		if (serverId != null && serverId.length()>0)
-		{
-			clientServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-		} 
-		String clientRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
-		
-		String currentServerText = hLinkClientServer_.getText();
-		String currentRuntimeText = hLinkClientRuntime_.getText();
-		String newServerText = CLIENT_SERVER_PREFIX + " " + clientServerText;
-		String newRuntimeText = CLIENT_RUNTIME_PREFIX + " " + clientRuntimeText;
-		hLinkClientServer_.setText(newServerText);
-		hLinkClientRuntime_.setText(newRuntimeText);
-		
-		/*check to see if text has changed for server or runtime
-		if so, repaint links */
-		if (!newServerText.equals(currentServerText))
-		{
-			hLinkClientServer_.pack(true);
-			packIt();
-		}			
-		
-		if (!newRuntimeText.equals(currentRuntimeText))
-		{
-			hLinkClientRuntime_.pack(true);
-			packIt();
-		} 	
-	}
-	
-    if (projectDialog_ != null)
-    	projectDialog_.setTypeRuntimeServer(ids_);
-    
-	//When the server changes, the state of needEar could change.
-	//If the the server change results in a change in the state of needEar,
-	//update needEar and clientEarProjectName.    
-    
-	ValidationUtils vu = new ValidationUtils();
-	boolean oldNeedEar = getClientNeedEAR();
-	boolean clientProjectOrProjectTypeNeedsEar;
-
-	if (!oldNeedEar) {
-			// If an EAR was not needed previously it could have been because of
-			// the project/project type or the server.
-			// If it was because of the project/project type, changing the
-			// server should have no impact
-			// on the state of needEar.
-			clientProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getClientProjectName(),
-					getClientComponentType());
-		} else {
-			clientProjectOrProjectTypeNeedsEar = true;
-		}
-
-		// boolean clientProjectOrProjectTypeNeedsEar =
-		// vu.projectOrProjectTypeNeedsEar(getClientProjectName(),
-		// getClientComponentType());
-		if (clientProjectOrProjectTypeNeedsEar) {
-			// Could not rule out need for an Ear from the project/project type
-			// so changing the server
-			// may impact the need for an Ear.
-			boolean currentServerNeedsEar = vu.serverNeedsEAR(getTypeRuntimeServer().getServerId());
-			if (oldNeedEar != currentServerNeedsEar) {
-				// Update needEar and serviceEarProjectName.
-				if (currentServerNeedsEar) {
-					// Calculate a reasonable default for the Ear project name
-					String earProjectName = DefaultingUtils.getDefaultEARProjectName(getClientProjectName());
-					setClientNeedEAR(currentServerNeedsEar);
-					setClientEarProjectName(earProjectName);
-				} else {
-					setClientNeedEAR(currentServerNeedsEar);
-					setClientEarProjectName("");
-				}
-
-			}
-		}		    
-  }
-  
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    return ids_;  
-  }
-      
-  public boolean getGenerateProxy()
-  {
-	  return getClientGeneration() <= ScenarioContext.WS_DEVELOP;
-  }
-  
-  public boolean getDevelopClient() {
-	  return developClient_;
-  }
-
-  public void setDevelopClient(boolean developClient) {
-	  this.developClient_ = developClient;
-  }	
-
-  public boolean getAssembleClient() {
-	  return assembleClient_;
-  }
-
-  public void setAssembleClient(boolean assembleClient) {
-	  this.assembleClient_ = assembleClient;
-  }
-
-  public boolean getDeployClient() {
-	  return deployClient_;
-  }
-
-  public void setDeployClient(boolean deployClient) {
-	  this.deployClient_ = deployClient;
-  }
-  
-  public void setTestClient(Boolean value)
-  {
-	  testClient_ = value;
-  }
-  
-  public Boolean getTestClient()
-  {
-	  return testClient_;
-  }
-  
-  public Boolean getInstallClient()
-  {
-	  return installClient_;
-  }
-  
-  public Boolean getStartClient()
-  {
-	  return startClient_;
-  }
-  
-  public void setInstallClient( Boolean value )
-  {
-      installClient_ = value;    
-  }
-    
-  public void setStartClient( Boolean value )
-  {
-      startClient_ = value;    
-  }
-
-  
-	private void launchProjectDialog()
-	{
-		String currentProjectName = getClientProjectName();
-		String currentEarProjectName = getClientEarProjectName();
-		String currentProjectType = getClientComponentType();
-		boolean currentNeedEar = getClientNeedEAR();
-		
-		projectDialog_.setProjectName(currentProjectName);
-		projectDialog_.setEarProjectName(currentEarProjectName);
-		projectDialog_.setNeedEAR(currentNeedEar);	
-		projectDialog_.setProjectComponentType(currentProjectType);
-		
-		int status = projectDialog_.open();
-		
-		if (status == Window.OK)
-		{
-			String newProjectName = projectDialog_.getProjectName();
-			String newEarProjectName = projectDialog_.getEarProjectName();
-			String newProjectType = projectDialog_.getProjectComponentType();
-			boolean newNeedEar = projectDialog_.getNeedEAR();	
-			
-			//Update project settings and validate page if selections changed.
-			if (!newProjectName.equals(currentProjectName)
-					|| !newEarProjectName.equals(currentEarProjectName)
-					|| !newProjectType.equals(currentProjectType)
-					|| newNeedEar != currentNeedEar) {
-				setClientProjectName(newProjectName);
-				setClientEarProjectName(newEarProjectName);
-				setClientNeedEAR(newNeedEar);
-				setClientComponentType(newProjectType);				
-				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
-				statusListener_.handleEvent(null);
-			}
-			
-			/*check to see if text has changed for project or EAR
-			if so, repaint links */
-			if (!newProjectName.equals(currentProjectName))
-			{
-				hLinkClientProject_.pack(true);
-				packIt();
-			}
-			if (!newEarProjectName.equals(currentEarProjectName))
-			{
-				hLinkClientEAR_.pack(true);
-				packIt();
-			}
-		}		
-	}
-  
-  private void launchRuntimeSelectionDialog(boolean clientContext) {
-	  launchRuntimeSelectionDialog(clientContext, false);
-  }
-  
-  private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst)
-	{
-	    TypeRuntimeServer currentClientTRS = getTypeRuntimeServer();
-	    RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(shell_, (byte)1, getTypeRuntimeServer(), "14");
-	    rssd.setSelectServerFirst(selectServerFirst);
-	    int status = rssd.open();
-		if (status == Window.OK)
-		{
-			TypeRuntimeServer newClientTRS = rssd.getTypeRuntimeServer();			
-			if (!currentClientTRS.equals(newClientTRS))
-			{
-				setTypeRuntimeServer(rssd.getTypeRuntimeServer());
-				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
-				statusListener_.handleEvent(null); //validate the page
-			}
-		}		
-	}
-  
-  //Private method should be used whenever clientScale_ setting is changed
-  //instead of calling clientScale_.setSelection directly.
-  private void setClientScale(int setting)
-  {
-	  clientScale_.setSelection(setting);
-	  clientScaleSetting_ = setting;
-  }
-  
-  protected void initImageRegistry()
-	{
-		imageReg_ = new ImageRegistry(Display.getCurrent());
-		
-		imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_0));
-		imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_1));
-		imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_2));
-		imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_3));
-		imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_4));
-		imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_5));
-		imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_6));
-		
-		imageReg_.put(GRAPHIC_CLIENT_0, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_0));
-		imageReg_.put(GRAPHIC_CLIENT_1, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_1));
-		imageReg_.put(GRAPHIC_CLIENT_2, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_2));
-		imageReg_.put(GRAPHIC_CLIENT_3, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_3));
-		imageReg_.put(GRAPHIC_CLIENT_4, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_4));
-		imageReg_.put(GRAPHIC_CLIENT_5, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_5));		
-		imageReg_.put(GRAPHIC_CLIENT_6, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(GRAPHIC_CLIENT_6));
-	}
-  
-  private void setGraphics(int selection)
-  {
-     String iconImage = "";
-     String topologyImage = "";
-     
-	  switch (selection) {
-	    case ScenarioContext.WS_TEST:
-			iconImage=ICON_SCALE_BG_0;
-			topologyImage=GRAPHIC_CLIENT_0;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
-			break;
-	    case ScenarioContext.WS_START:
-			iconImage=ICON_SCALE_BG_1;
-			topologyImage=GRAPHIC_CLIENT_1;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
-			break;
-		case ScenarioContext.WS_INSTALL:
-			iconImage=ICON_SCALE_BG_2;
-			topologyImage=GRAPHIC_CLIENT_2;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
-			break;
-		case ScenarioContext.WS_DEPLOY:
-			iconImage=ICON_SCALE_BG_3;
-			topologyImage=GRAPHIC_CLIENT_3;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
-			break;
-		case ScenarioContext.WS_ASSEMBLE:
-			iconImage=ICON_SCALE_BG_4;
-			topologyImage=GRAPHIC_CLIENT_4;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
-			break;
-		case ScenarioContext.WS_DEVELOP:
-			iconImage=ICON_SCALE_BG_5;
-			topologyImage=GRAPHIC_CLIENT_5;
-			clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
-			break;
-		case ScenarioContext.WS_NONE:			
-			if (!clientOnly_)
-			{
-				if (enableProxy_)  //if service is start or test...
-					iconImage=ICON_SCALE_BG_6;  
-				else
-					iconImage=null;
-				topologyImage=GRAPHIC_CLIENT_6;
-				clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_CLIENT);
-			}
-			else
-			{
-				setClientScale(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop client @ minimum
-				iconImage=ICON_SCALE_BG_5;
-				topologyImage=GRAPHIC_CLIENT_5;				
-				clientScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);			
-			}
-			break;
-		default:
-			break;
-		}
-		clientScale_.setBackgroundImage(imageReg_.get(iconImage));
-		topologySpot_.setImage(imageReg_.get(topologyImage));	
-  }
-  
-	public IStructuredSelection getObjectSelection()
-	{
-		return objectSelection_;		
-	}
-	
-	public void setObjectSelection(IStructuredSelection selection)
-	{
-        objectSelection_ = selection;
-	}
-	
-  public int getClientGeneration()
-  {
-	  return clientScaleSetting_;
-  }
-  
-  public void setClientGeneration(int value)
-  {
-	  if (clientOnly_ && value == ScenarioContext.WS_NONE) {
-		  value = ScenarioContext.WS_DEVELOP;
-		  setDevelopClient(true);
-	  }
-
-	  setClientScale(value);
-	  	  
-	  setGraphics(value);
-	  showSummary(value < ScenarioContext.WS_NONE);
-	  updateFields(value);
-  }
-  
-  public void setProject(IProject project)
-  {
-	  project_ = project;
-  }
-  
-  public IProject getProject()
-  {
-	  return project_;
-  }
-  
-  public String getClientRuntimeId()
-  {
-	  // calculate the most appropriate clientRuntimeId based on current settings.
-	  return WebServiceRuntimeExtensionUtils2.getClientRuntimeId(getTypeRuntimeServer(), getClientProjectName(), getClientComponentType());   
-
-  }
-  
-  public void setClientComponentType(String type)
-  {
-	  clientComponentType_= type;
-  }
-
-  public String getClientComponentType()
-  {
-	  return clientComponentType_;
-  }
-
-  public void setClientProjectName(String name)
-  {
-    projectName_ = name;      
-	hLinkClientProject_.setText(CLIENT_PROJECT_PREFIX + " " + projectName_);	
-	hLinkClientProject_.pack(true);   
-	packIt();
-  }
-  
-  public String getClientProjectName()
-  {  
-	  if (projectName_ == null)
-		  return "";
-	  return projectName_;
-  }
-  
-  public void setClientEarProjectName(String name)
-  {
-    earProjectName_ = name;  
-    refreshEARLink();
-   		   
-  }
-  
-  public void refreshEARLink()
-  {
-	  hLinkClientEAR_.setVisible(needEar_ && getGenerateProxy());
-	  if (needEar_)
-	  {    	
-		  hLinkClientEAR_.setText(CLIENT_EAR_PREFIX + " " + earProjectName_);
-		  hLinkClientEAR_.pack(true); 
-		  packIt();
-	  }  
-  }
-	    
-  public String getClientEarProjectName()
-  {
-	  if (earProjectName_ == null)
-		  return "";
-     return earProjectName_;  
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-     needEar_ = b;
-     refreshEARLink();
-  } 
-  
-  public boolean getClientNeedEAR()
-  {
-     return needEar_;
-  } 
-  
-  public WebServicesParser getWebServicesParser()
-	{
-		return parser_;
-	}
-	
-	public void setWebServicesParser(WebServicesParser parser)
-	{
-		parser_ = parser;		
-	}
-  
-    //for the purposes of disabling the service implementation controls from the preferences dialog
-	public void disableNonPreferenceWidgets()
-	{
-		if (hCompClient_ != null)
-		{
-			hCompClient_.setVisible(false);			
-		}
-	}
-	
-	public int getValidationState()
-	{
-		return validationState_;
-	}
-	
-	public void setValidationState(int state)
-	{
-		validationState_ = state;
-	}
-		
-	public IStatus checkMissingFieldStatus() {
-
-		ValidationUtils valUtils = new ValidationUtils();
-		String runtimeId = getTypeRuntimeServer().getRuntimeId();
-		String serverId = getTypeRuntimeServer().getServerId();
-		String projectName = getClientProjectName();
-		boolean needEar = getClientNeedEAR();
-		String earProjectName = getClientEarProjectName();
-		String projectTypeId = getClientComponentType();
-		IStatus missingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, null, null, runtimeId, serverId,
-				projectName, needEar, earProjectName, projectTypeId, true);
-		return missingFieldStatus;
-	}
-
-	public IStatus checkErrorStatus() {
-
-		ValidationUtils valUtils = new ValidationUtils();
-		String projectName = getClientProjectName();
-		boolean needEar = getClientNeedEAR();
-		String earProjectName = getClientEarProjectName();
-		String projectTypeId = getClientComponentType();
-		// Defect 215084 - no need to pass initial project for client scenario
-		IStatus possibleErrorStatus = valUtils.checkErrorStatus(validationState_, getTypeRuntimeServer(), projectName,"", needEar, earProjectName, projectTypeId, true);
-			return possibleErrorStatus;
-	}
-
-	public IStatus checkWarningStatus() {
-		ValidationUtils valUtils = new ValidationUtils();
-
-		int scaleSetting = getClientGeneration();
-		String serverId = getTypeRuntimeServer().getServerId();
-		IStatus warningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getTypeRuntimeServer().getServerInstanceId(), true);
-		return warningStatus;
-	}	
-	
-	
-  private class ScaleSelectionListener implements SelectionListener
-	{
-		public void widgetSelected(SelectionEvent e) {
-			    int oldClientScaleSetting = clientScaleSetting_;
-			    				
-				int selection = clientScale_.getSelection();
-				
-				//WARNING: No scale change should be done after the line below, 'selection' might not have the correct value
-				setClientGeneration(selection);
-				
-				//When client slider moves out of the "WS_NONE" state, VALIDATE_ALL should be done. 
-				//Otherwise, VALIDATE_SCALE_CHANGES is sufficient.
-				if (oldClientScaleSetting==ScenarioContext.WS_NONE && clientScaleSetting_!=ScenarioContext.WS_NONE)
-				{
-					validationState_ = ValidationUtils.VALIDATE_ALL;
-				}
-				else
-				{
-					validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);	
-				}				
-				statusListener_.handleEvent(null); //validate the page
-			}
-		
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-	} 
-  
-  private void refreshServerRuntimeSelection()
-	{		
-		//new up ServerRuntimeSelectionWidgetDefaultingCommand
-		ClientRuntimeSelectionWidgetDefaultingCommand clientRTDefaultCmd = new ClientRuntimeSelectionWidgetDefaultingCommand();
-		
-		  //call setters of new defaulting command:
-		  clientRTDefaultCmd.setClientInitialSelection(getObjectSelection());
-		  clientRTDefaultCmd.setClientInitialProject(getProject());	      
-	      clientRTDefaultCmd.setClientTypeRuntimeServer(getTypeRuntimeServer());
-		  clientRTDefaultCmd.setWebServicesParser(getWebServicesParser());     
-	      clientRTDefaultCmd.setClientEarProjectName(getClientEarProjectName());
-		  		  
-		  clientRTDefaultCmd.execute(null, null);
-		  
-		  //perform mappings from the defaulting command to the project settings...	
-		  setClientProjectName(clientRTDefaultCmd.getClientProjectName());
-		  setClientEarProjectName(clientRTDefaultCmd.getClientEarProjectName());
-		  setClientComponentType(clientRTDefaultCmd.getClientComponentType());
-		  setTypeRuntimeServer(clientRTDefaultCmd.getClientTypeRuntimeServer());
-          setClientNeedEAR(clientRTDefaultCmd.getClientNeedEAR());
-	}
-}
-
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 89e2453..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20060221 119111    rsinha@ca.ibm.com - Rupam Kuehner
- * 20060223 129020    rsinha@ca.ibm.com - Rupam Kuehner
- * 20060406 135350    kathy@ca.ibm.com - Kathy Chan
- * 20060407 135415    rsinha@ca.ibm.com - Rupam Kuehner
- * 20060425 138052    kathy@ca.ibm.com - Kathy Chan
- * 20060517 141880    pmoogk@ca.ibm.com - Peter Moogk
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530   144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060717   146332 makandre@ca.ibm.com - Andrew Mak
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502   180304 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071031   140518 joan@ca.ibm.com - Joan Haggarty
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506   227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080715   240722 makandre@ca.ibm.com - Andrew Mak, Cannot setup TCP/IP Monitor for soap12 endpoints
- * 20080722   240231 gilberta@ca.ibm.com - Gilbert Andrews
- * 
- *******************************************************************************/
-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.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.common.ScenarioCleanupCommand;
-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.extension.PreClientInstallCommand;
-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.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.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;
-import org.eclipse.wst.ws.internal.monitor.GetMonitorCommand;
-
-
-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)
-  { 
-	  //jvh mapping for initialselection????
-	  
-    // 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, "ClientGeneration", ClientWizardWidget.class );
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", 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);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "StartClient", ClientWizardWidgetOutputCommand.class);
-
-    //jvh added..
-    dataRegistry.addMapping(ClientWizardWidget.class, "Project", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "WebServicesParser", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "WsdlURI", ClientWizardWidgetOutputCommand.class);
-            
-    //jvh - rerouted the defaulting command to the ClientWizardWidget 
-    // Before ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientWizardWidget.class);    
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientWizardWidget.class);    
-    
-    //jvh - rerouted from ClientWizardWidget instead of runtimeserverwidget- add getters to ClientWizardWidget for them
-    // After ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); 
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-        
-    // Before WSDLSelectionWidgetWrapper
-    // jvh - rerouted these to ClientWizardWidget  
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientWizardWidget.class );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", ClientWizardWidget.class );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", ClientWizardWidget.class );
-    
-/*    // After WSDLSelectionWidgetWrapper
-    //jvh - reroute these from the dialog to ClientWizardWidget - call setters on the other dialogs...
-    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);
-	dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId",TestDefaultingFragment.class);
-	
-    // Before Client Test widget.
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
-    dataRegistry.addMapping(PreClientInstallCommand.class, "CanRunTestClient", 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, "RunTestClient",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, "RunTestClient",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "CanRunTestClient",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);
-  }
-
-  /* (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_CLIENT,
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ClientWizardWidget();
-				          }
-				        } );
-    
-    //jvh
-    /*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();
-						  }
-						} );*/
-    
-    //jvh
-    /*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(true), "" ) );
-      add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), "")); //jvh moved this up
-      add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));  //jvh moved this up      
-      add( new SimpleFragment( "ClientWizardWidget" ) );
-	  //add( new TestCommandFactoryFragment() );
-      add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-      
-      //add( new TestCommandFactoryFragment2() );
-      //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, "RunTestClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DevelopClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "AssembleClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "DeployClient", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "StartClient", ClientWizardWidgetOutputCommand.class);
-
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.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, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientRuntimeSelectionWidgetDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-                  
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
-      //jvh - rerouted these to the ClientWizardWidgetOutputCommand 
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientWizardWidgetOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", ClientWizardWidgetOutputCommand.class);
-      
-      // WSDLSelectionOutputCommand
-      //jvh - rerouted these from ClientWizardWidgetOutputCommand 
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", GetMonitorCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);
-
-      
-      //jvh - add code to widget so that the appropriate sets happen and defaulting occurs again after object selection
-      /*dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);*/
-      
-	  // Setup the PreClientDevelopCommand.
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class);
-           
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DevelopClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", 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, "ProxyBean", 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, "RunTestClient",ClientTestDelegateCommand.class); 
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class); 
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", GetMonitorCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "CanGenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
-	  dataRegistry.addMapping(PreClientInstallCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
-	  
-      // GetMonitorCommand
-      dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      
-      // 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 16b3fa8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,140 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404   134913 sengpl@ca.ibm.com - Seng Phung-Lu       
- * 20060517   142339 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-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) {
-    
-    // widget
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"HandlerServiceRefHolder", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-    
-    // output
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ClientHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", ClientHandlersWidgetOutputCommand.class);
-    
-    // gen skeleton
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", GenerateHandlerSkeletonCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    // open in editor
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
-    
-  }
-
-  /*
-   * (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 c7b7c7a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- *******************************************************************************/
-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) {
-    
-	// widget
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"HandlerDescriptionHolders", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-    
-    // output command (adds/removes from model)
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsddResource", ServiceHandlersWidgetOutputCommand.class);    
-
-    // gen skeleton command
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", GenerateHandlerSkeletonCommand.class);    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
- 
-    // open Java editor  
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
-  }
-
-  /*
-   * (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 53969b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,256 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060404 134913   sengpl@ca.ibm.com - Seng Phung-Lu       
- *******************************************************************************/
-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.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
-    // widget
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"HandlerServiceRefHolder", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"IsMultipleSelection", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-    
-    // output
-
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", ClientHandlersWidgetOutputCommand.class);
-    
-    // gen skeleton
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerServiceRefHolder", GenerateHandlerSkeletonCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    // open in editor
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", null);
-  
- 
-    // Map service-side widgets to commands
-    // widget
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"HandlerDescriptionHolders", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-    
-    // output command (adds/removes from model)
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", ServiceHandlersWidgetOutputCommand.class);
-    
-
-    // gen skeleton command
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerDescriptionHolders", GenerateHandlerSkeletonCommand.class);    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
- 
-    // open Java editor  
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", OpenJavaEditorCommand.class,"IsEnabled", 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("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,"IsMultipleSelection", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-      dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-   
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "IsMultipleSelection", ServiceHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsddResource", ServiceHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-      dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.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 325adb6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060608   145529 kathy@ca.ibm.com - Kathy Chan
- * 20060717   146332 makandre@ca.ibm.com - Andrew Mak
- * 20070516   186233 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070815   199626 kathy@ca.ibm.com - Kathy Chan
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080331   224953 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080415   227237 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616   237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619   237797 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-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.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.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.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.jst.ws.internal.plugin.WebServicePlugin;
-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.core.selection.SelectionList;
-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();  
-             }
-           };
-  }
-
-  public SelectionList getLegitTestFacility()
-  {
-   	ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	String[] testTypes = scenarioContext.getWebServiceTestTypes();	  
-  	List newTestTypes = new ArrayList();
-		
-  	for(int i = 0;i<testTypes.length;i++){
-  		WebServiceTestExtension extension =
-  			(WebServiceTestExtension) WebServiceTestRegistry.getInstance()
-  			.getWebServiceExtensionsByName(testTypes[i]);
-		  
-  		if(extension.testJavaProxy()){
-  			boolean defaultJaxrpc = extension.isDefaultJAXRPC();
-  			if(defaultJaxrpc){
-  				newTestTypes.add(testTypes[i]); 
-    			}
-  		}
-  	}	
-  	String[] tempArray = new String[newTestTypes.size()];
-  	return new SelectionList((String[]) newTestTypes.toArray(tempArray), 0);
-  }
-  
-  /* (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(ClientExtensionDefaultingCommand.class, "RunTestClient", ClientTestWidget.class );
-    dataRegistry.addMapping(InitializeProxyCommand.class, "CanRunTestClient", ClientTestWidget.class );
-    dataRegistry.addMapping(InitializeProxyCommand.class, "IsWebProject", 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(InitializeProxyCommand.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(InitializeProxyCommand.class, "Popup",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",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, "RunTestClient",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);
-    dataRegistry.addMapping(ClientTestWidget.class, "ServerInstanceId", FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "ExistingServerId", FinishDefaultCommand.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_;
-	private boolean canRunTestClient_;
-	private boolean isWebProject = false;
-    
-	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);
-	    	}
-	    }    
-	  
-	    IProject project = ProjectUtilities.getProject(project_);
-	    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());
-	  			clientInfo.setServerCreated(true);
-	  			canRunTestClient_ = true;
-	  		}
-	  		else if (createServerStatus.getSeverity()==Status.ERROR){
-	  			if(J2EEUtils.isWebComponent(project))
-	  				canRunTestClient_ = false;
-	  			else 
-	  				canRunTestClient_ = true;
-	  		}               
-	  	}
-	  	else {
-	  		canRunTestClient_ = true;
-	  	}
-	  	
-	  	
-	  	IProject[] earproject = J2EEProjectUtilities.getReferencingEARProjects(project);
-	  	boolean earNull = false;
-	  	if (earproject.length<1) earNull = true;
-	  		
-	  	boolean j2eeProject = J2EEProjectUtilities.isJEEProject(project);
-	  	if(J2EEUtils.isWebComponent(project))
-	  		isWebProject = true;
-	  	
-	  	if (j2eeProject && earNull)
-	  		canRunTestClient_ = false;
-	  		  	
-		if (!earNull && clientInfo.getServerInstanceId() != null){
-	  		
-	  		AddModuleToServerCommand command = new AddModuleToServerCommand();
-	  		command.setServerInstanceId(clientInfo.getServerInstanceId());
-	  		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 boolean getPopup(){
-		return true;
-	}
-	
-	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 getCanRunTestClient(){
-		return canRunTestClient_;
-	}
-	
-    public boolean getGenerateProxy()
-    {
-      return true;
-    }
-    
-    public boolean getCanGenerateProxy()
-    {
-      return true;
-    }
-        
-    public SelectionList getTestFacility()
-    {
-    	return getLegitTestFacility();
-    }
-    
-    public boolean getIsWebProject()
-    {
-    	return isWebProject;
-    }
-    
-	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(true), "" ) );
-      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);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "RunTestClient", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", 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, "RunTestClient", 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", ClientExtensionDefaultingCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", TestDefaultingFragment.class);
-	  dataRegistry.addMapping(InitializeProxyCommand.class, "CanGenerateProxy", ClientTestFragment.class);
-	  dataRegistry.addMapping(InitializeProxyCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "RunTestClient", 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, "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 bd7ef39..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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();
-        }
-      }
-    );
-  }
-}
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 e95cd41..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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);
-        }
-      }
-    );
-  }
-}
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 0e78537..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,661 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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          
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060818   154402 pmoogk@ca.ibm.com - Peter Moogk
- * 20060830   151091 kathy@ca.ibm.com - Kathy Chan, Client side still enabled when there's only stub server
- * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506   227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080729   241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20090714   283312 ericdp@ca.ibm.com - Eric D. Peters, ANT Client gen- message missing server name subst. variable
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-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.ServerUtils;
-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.RuntimeDescriptor;
-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 boolean           developClient_;
-	private boolean           assembleClient_;
-	private boolean           deployClient_;
-	
-  private TypeRuntimeServer    clientIds_;
-  private String               clientRuntimeId_;
-  private boolean              testService;
-  private Boolean              installClient;
-  private boolean              startClient;
-  private boolean              runTestClient;
-  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 testProxySelected.
-   */
-  public boolean getRunTestClient()
-  {
-    return runTestClient;
-  }
-
-  /**
-   * @param testProxySelected
-   *            The testProxySelected to set.
-   */
-  public void setRunTestClient(boolean runTestClient)
-  {
-    this.runTestClient = runTestClient;
-  }
-  
-  public boolean getDevelopClient() {
-	  return developClient_;
-  }
-
-  public void setDevelopClient(boolean developClient) {
-	  this.developClient_ = developClient;
-  }	
-
-  public boolean getAssembleClient() {
-	  return assembleClient_;
-  }
-
-  public void setAssembleClient(boolean assembleClient) {
-	  this.assembleClient_ = assembleClient;
-  }
-
-  public boolean getDeployClient() {
-	  return deployClient_;
-  }
-
-  public void setDeployClient(boolean deployClient) {
-	  this.deployClient_ = deployClient;
-  }
-  
-  /**
-   * @return Returns the installClient.
-   */
-  public Boolean getInstallClient()
-  {
-    return installClient;
-  }
-
-  /**
-   * @param installClient
-   *            The installClient to set.
-   */
-  public void setInstallClient(Boolean installClient)
-  {
-    this.installClient = installClient;
-  }
-  
-  /**
-   * @return Returns the startClient.
-   */
-  public boolean getStartClient()
-  {
-    return startClient;
-  }
-
-  /**
-   * @param startClient
-   *            The startClient to set.
-   */
-  public void setStartClient(boolean startClient)
-  {
-    this.startClient = startClient;
-  }
-  
-  /**
-   * @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 boolean getCanRunTestClient(){
-	  if(clientIds_.getServerInstanceId() != null) return true;
-	  
-	  return false;
-  }
-
-  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)
-    {
-      //Popup and error if the selected client project does not exist.
-      IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-      if (!clientProject.exists())
-      {
-        String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-        status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST, new String[]{clientProjectName_, runtimeLabel } ) );
-        env.getStatusHandler().reportError(status);
-      }
-      else
-      {
-        RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
-
-        if (desc.getServerRequired())
-        {
-          status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[] { scenario }));
-          env.getStatusHandler().reportError(status);
-        } 
-        else
-        {
-          // No server has been selected and the selected Web service runtime
-          // does not
-          // require a server. Set deploy, install, run, and test to false.
-          deployClient_ = false;
-          installClient = Boolean.FALSE;
-          startClient = false;
-          //testService = Boolean.FALSE;
-        }
-      }
-    }
-    
-    // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
-	boolean noRuntimeInstalled = true;
-	if (serverId != null) {
-    // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
-    String[] runtimes = WebServiceRuntimeExtensionUtils2.getAllServerFactoryIdsWithRuntimes();
-    for (int i = 0; i < runtimes.length; i++) {
-		if (runtimes[i].equals(serverId)){
-			noRuntimeInstalled = false;
-			break;
-		}
-	}
-    if (noRuntimeInstalled){
-        String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-        if (serverLabel == null) // Cannot translate from id to label, so let's just use the id
-        	serverLabel = serverId;
-    	status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED, new String[] {serverLabel}));
-        env.getStatusHandler().reportError(status);
-    }
-	}
-    
-    //If the server is non-null and is installed in Eclipse, ensure the server, runtime, and type are compatible
-    if (!noRuntimeInstalled && serverId != null && serverId.length() > 0)
-    {
-      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);
-      }
-      //If the project exists, ensure it supports the Web service type, Web service runtime, and server.
-      if (clientProjectName_ != null && ProjectUtilities.getProject(clientProjectName_).exists()) {
-    	  ValidationUtils vUtil = new ValidationUtils();
-          if (!vUtil.doesServerSupportProject(serverId,clientProjectName_)) {
-    	  status = StatusUtils.errorStatus(NLS.bind(
-					ConsumptionUIMessages.MSG_CLIENT_SERVER_DOES_NOT_SUPPORT_PROJECT,
-					new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId),clientProjectName_ }));
-    	  env.getStatusHandler().reportError(status);
-          }
-      }
-      // Determine if the selected server type has only stub runtimes associated
-      // with it and if a server instance is not selected.
-      // If so, set install and test to false in the context.
-      IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
-      if (nonStubRuntime == null && clientIds_.getServerInstanceId() == null)
-      {
-        installClient = Boolean.FALSE;
-        startClient = false;
-        //testService = Boolean.FALSE;
-      }
-    }
-
-	  // calculate the most appropriate clientRuntimeId based on current settings.
-	  clientRuntimeId_ = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(clientIds_, clientProjectName_, clientComponentType_);   
-
-    return status;
-  } 
-}
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 fa05d05..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 50631d4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20070502   180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-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 getCanGenerateProxy()
-  {
-	return !(webServiceClient_.getWebServiceClientInfo().getImplURL() == null);
-  }
-  
-  /**
-   * @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();
-  }
-
-  /**
-   * @return Returns the proxyEndpoint.
-   */
-  public String getProxyEndpoint() {
-  	return webServiceClient_.getWebServiceClientInfo().getProxyEndpoint();
-  }
-  
-  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 53bbfd6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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          
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060823   154938 pmoogk@ca.ibm.com - Peter Moogk
- * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
- * 20080326   171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080409   219121 trungha@ca.ibm.com - Trung Ha
- * 20080729   241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20081028   248625 ericdp@ca.ibm.com - Eric D. Peters, Exceptions running ANT tasks using inappropriate projects
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.commands.ExecutionException;
-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.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.common.ValidationUtils;
-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.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;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-
-public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation
-{
-	private boolean           developService_;
-	private boolean           assembleService_;
-	private boolean           deployService_;
-
-  private Boolean              installService;
-  private IProject			initialProject_;
-  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();
-  }
-
-  public boolean getDevelopService() {
-	  return developService_;
-  }
-
-  public void setDevelopService(boolean developService) {
-	  this.developService_ = developService;
-  }	
-
-  public boolean getAssembleService() {
-	  return assembleService_;
-  }
-
-  public void setAssembleService(boolean assembleService) {
-	  this.assembleService_ = assembleService;
-  }
-
-  public boolean getDeployService() {
-	  return deployService_;
-  }
-
-  public void setDeployService(boolean deployService) {
-	  this.deployService_ = deployService;
-  }
-  
-  /**
-   * @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;
-  }
-  public void setInitialProject(IProject initialProject)
-  {
-	  initialProject_ = initialProject;  
-  }	
-    
-  public IProject getInitialProject()
-  {
-	  return initialProject_;  
-  }	
-  /**
-   * @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)
-    {
-      //Popup and error if the selected service project does not exist.
-      IProject serviceProject = ProjectUtilities.getProject(serviceProjectName_);
-      if (!serviceProject.exists())        
-      {
-        String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(runtimeId);
-        status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_PROJECT_MUST_EXIST, new String[]{ serviceProjectName_, runtimeLabel } ) );
-        env.getStatusHandler().reportError(status);
-      }
-      else
-      {
-
-        RuntimeDescriptor desc = WebServiceRuntimeExtensionUtils2.getRuntimeById(runtimeId);
-        if (desc.getServerRequired())
-        {
-          status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_NO_SERVER, new String[] { scenario }));
-          env.getStatusHandler().reportError(status);
-        } 
-        else
-        {
-          // No server has been selected and the selected Web service runtime
-          // does not require a server. Set deploy, install, run, and test to false.
-          deployService_ = false;
-          installService = Boolean.FALSE;
-          startService = Boolean.FALSE;
-          testService = Boolean.FALSE;
-        }
-      }
-    }
-    
-    // If the server is non-null, ensure there is an installed server with ID the same as 'serverID' registered in Eclipse
-	boolean noRuntimeInstalled = true;
-	if (serverId != null) {
-    String[] runtimes = WebServiceRuntimeExtensionUtils2.getAllServerFactoryIdsWithRuntimes();
-
-    for (int i = 0; i < runtimes.length; i++) {
-		if (runtimes[i].equals(serverId)){
-			noRuntimeInstalled = false;
-			break;
-		}
-	}
-    if (noRuntimeInstalled){
-        String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-        if (serverLabel == null) // Cannot translate from id to label, so let's just use the id
-        	serverLabel = serverId;
-    	status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME_INSTALLED, new String[] {serverLabel}));
-        env.getStatusHandler().reportError(status);
-    }
-	}
-    
-    //If the server is non-null and is installed in Eclipse, ensure the server, runtime, and type are compatible
-    if (!noRuntimeInstalled && serverId != null && serverId.length() > 0)
-    {
-      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);
-      }
-      //If the project exists, ensure it supports the Web service type, Web service runtime, and server.
-      if (getInitialProject() != null && getInitialProject().getName() != null && ProjectUtilities.getProject(getInitialProject().getName()).exists()) {
-    	ValidationUtils valUtils = new ValidationUtils();
-    	
-		if (WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId) == WebServiceScenario.BOTTOMUP &&
-	    		FacetUtils.isJavaProject(getInitialProject())){
-	    		if(!valUtils.doesServerSupportProject(serverId,getInitialProject().getName())){
-	    	    	status  = StatusUtils.errorStatus(NLS.bind(
-							ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_JAVAPROJECT,
-							new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId), getInitialProject().getName() }));
-	    	    	env.getStatusHandler().reportError(status);
-	  		    }
-		} 
-		if (!valUtils.doesServerSupportProject(serverId, serviceProjectName_)) {
-			status = StatusUtils.errorStatus(NLS.bind(
-					ConsumptionUIMessages.MSG_SERVICE_SERVER_DOES_NOT_SUPPORT_PROJECT,
-					new String[] { WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId),
-							serviceProjectName_ }));
-			env.getStatusHandler().reportError(status);
-		}
-	  }
-      // Determine if the selected server type has only stub runtimes associated
-      // with it and if a server instance is not selected.
-      // If so, set install, run, and test to false in the context.
-      IRuntime nonStubRuntime = ServerUtils.getNonStubRuntime(serverId);
-      if (nonStubRuntime == null && serviceIds_.getServerInstanceId() == null)
-      {
-        installService = Boolean.FALSE;
-        startService = Boolean.FALSE;
-        testService = Boolean.FALSE;
-      }
-    }
-
-	// calculate the most appropriate clientRuntimeId based on current settings.
-	serviceRuntimeId_ = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId( serviceIds_, serviceProjectName_, serviceComponentType_);   
-    
-    return status;
-  }
-}
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 500a495..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 b183cd2..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 805c970..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ /dev/null
@@ -1,67 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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.swt.graphics.Point;
-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;
-  }
-  
-   public  String getObjectSelectionDisplayableString()
-   {
-	    //  subclass should override this method
-	  return "";
-   }
-   
-   public Point getWidgetSize()
-   {
-      // subclasses should override with an appropriate default dialog size for this widget	  
- 	  return null;  
-   }
-   
-   public boolean validate(String s) {
-    // subclass should override this method
-	return true;
-    }  
-  }
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 ebd83f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070116   159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20080212   208795 ericdp@ca.ibm.com - Eric D. Peters, WS wizard framework should support EJB 3.0
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-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());
-      } 
-      else if (sel instanceof SessionBean) 
-      {
-    	  return new StructuredSelection(((SessionBean)sel).getEjbName());
-      }
-      else if (sel instanceof ServiceImplBean)
-      {
-        return new StructuredSelection(getBeanName((ServiceImplBean) sel));
-      }
-      else if (sel instanceof EJBLink)
-      {
-        return new StructuredSelection(getBeanName((EJBLink) sel));
-      }
-    }
-    return value;
-  }
-  
-  private String getBeanName(ServiceImplBean bean) {
-	  EObject eObject = bean.eContainer();
-	  if (eObject instanceof PortComponent) {
-		  PortComponent pc = (PortComponent) eObject;
-		  return pc.getPortComponentName();	      	
-	  }
-	  return "";
-  }
-  
-  private String getBeanName(EJBLink link) {
-	  EObject eObject = link.eContainer();
-	  if (eObject instanceof ServiceImplBean)
-		  return getBeanName((ServiceImplBean) eObject);
-	  return "";
-  }
-}
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 ee4c831..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060329   128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418   136180 kathy@ca.ibm.com - Kathy Chan
- * 20060524   141194 joan@ca.ibm.com - Joan Haggarty
- * 20060825   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20080212   208795 ericdp@ca.ibm.com - Eric Peters, WS wizard framework should support EJB 3.0
- * 20080229   218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20080428   224726 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.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.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-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.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-
-  private Combo earList;
-  private EJBTableViewer beanList;
-  private IVirtualComponent[] earComponents;
-  private Integer selectedBeanIndex = null;
-  private Vector ejbBeanNames;
-  private Vector ejbComponentNames;
-  private Vector ejbComponentProjectNames;
-  private Hashtable ejbValuesByEARSelectionCache;
-  private Listener  statusListener_;
-  private String displayString_ = "";
-  /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
-  private String INFOPOP_PEBD_EAR_PROJECTS = "PEBD0001";
-  /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
-  private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "PEBD0002";
-
-  public EJBSelectionWidget()
-  {
-	earComponents = J2EEUtils.getAllEARComponents();
-    ejbValuesByEARSelectionCache = new Hashtable();
-  }
-
-  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;
-    UIUtils utils = new UIUtils( WebServiceConsumptionUIPlugin.ID );
-    
-    Composite composite = utils.createComposite(parent, 1, 0, 0);
-    
-    Composite projectComposite = utils.createComposite(composite, 2);
-    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);
-        int earListSelectionIndex = widget.getSelectionIndex();
-        if (earListSelectionIndex > 0)
-        {
-          setBeanList(earComponents[earListSelectionIndex-1]);
-        }
-        else
-        {
-          setBeanList(null);
-        }
-        selectedBeanIndex = null;
-        statusListener_.handleEvent(null);
-      }
-    });
-    addEARNamesToList();
-    earList.setToolTipText(ConsumptionUIMessages.TOOLTIP_EAR_PROJECTS);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
-    
-    Group beanComposite = utils.createGroup(composite, ConsumptionUIMessages.LABEL_EJB_BEAN_NAME, "", "");
-    beanList = new EJBTableViewer(beanComposite);    
-    Table beanTable = beanList.getTable();
-    GridData 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]);
-    }
-    else
-    {
-      setBeanList(null);
-    }
-    
-    // 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()
-  {
-    earList.add(ConsumptionUIMessages.LABEL_SHOW_ALL_STATELESS_SESSION_EJBS);
-    if (earComponents != null && earComponents.length > 0)
-    {
-      for (int index = 0; index < earComponents.length; index++)
-      {
-        earList.add(earComponents[index].getName());
-      }
-      earList.setText(earList.getItem(1));
-    }
-  }
-
-  private void setBeanList(IVirtualComponent earComponent)
-  {    
-    String cacheKey = (earComponent == null)? earList.getItem(0): earComponent.getName();
-    
-    //Check if we've already cached results for this case. If so, use the
-    //cached values and return. If not, continue.
-    EJBTableValues cachedValues = (EJBTableValues)ejbValuesByEARSelectionCache.get(cacheKey);
-    if (cachedValues != null)
-    {
-      ejbBeanNames = cachedValues.cachedEjbBeanNames;
-      ejbComponentNames = cachedValues.cachedEjbComponentNames;
-      ejbComponentProjectNames = cachedValues.cachdedEjbComponentProjectNames;
-      beanList.setData(ejbBeanNames, ejbComponentNames);
-      beanList.setInput(ejbBeanNames);    
-      return;
-    }
-    
-    IVirtualComponent[] ejbComponentsArray = null;
-    if (earComponent == null)
-    {  
-      ejbComponentsArray = J2EEUtils.getAllEJBComponents();      
-    }
-    else
-    {
-      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++)
-    {
-    	IProject project = ejbComponentsArray[index].getProject();
-        Vector beans = J2EEUtils.getBeanNames(project);
-        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));                
-   
-    }
-    beanList.setData(ejbBeanNames, ejbComponentNames);
-    beanList.setInput(ejbBeanNames);
-    
-    //Cache the results for next time
-    EJBTableValues ejbTableValues = new EJBTableValues();
-    ejbTableValues.cachedEjbBeanNames = ejbBeanNames;
-    ejbTableValues.cachedEjbComponentNames = ejbComponentNames;
-    ejbTableValues.cachdedEjbComponentProjectNames = ejbComponentProjectNames;
-    ejbValuesByEARSelectionCache.put(cacheKey, ejbTableValues);        
-  }
-    
-  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();
-              }
-				
-			      }
-          }
-          
-          //Haven't returned yet so we did not find an EAR that contains this EJB. Initialize the page accordingly.
-          earList.setText(earList.getItem(0));
-          setBeanList(null);
-          beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
-          selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
-        }
-      }
-      else if (object instanceof String)
-    	  displayString_ = (String) object; // save for display use
-    }
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-		String selEJBName = (String) ejbBeanNames.get(selectedBeanIndex
-				.intValue());
-		if (selEJBName != null) {
-			// Get the project containing the bean to get the corresponding
-			// Session object.
-			// Then return the Session object in an IStructuredSelection.
-			String ejbComponentName = (String) ejbComponentNames
-					.get(selectedBeanIndex.intValue());
-			IVirtualComponent ejbComponent = ComponentUtilities
-					.getComponent(ejbComponentName);
-			IProject project = ejbComponent.getProject();
-			IModelProvider provider = ModelProviderManager
-					.getModelProvider(project);
-			Object modelObject = provider.getModelObject();
-			List sessions = new Vector();
-			boolean isJ2EE5 = J2EEProjectUtilities.isJEEProject(project);
-			if (isJ2EE5) {
-	    		//a JEE5 project
-	    		EnterpriseBeans eBeans = ((org.eclipse.jst.javaee.ejb.EJBJar)modelObject).getEnterpriseBeans();
-	    		if (eBeans !=null)
-	    			sessions = eBeans.getSessionBeans();
-			} else {
-				sessions = ((EJBJar) modelObject).getSessionBeans();
-			}
-			for (Iterator it2 = sessions.iterator(); it2.hasNext();) {
-				Object next = (it2.next());
-				if (isJ2EE5) {
-					SessionBean session = (SessionBean) next;
-					if (selEJBName.equals(session.getEjbName()))
-						return new StructuredSelection(
-								new SessionBean[] { session });
-
-				} else {
-					Session session = (Session) next;
-					if (selEJBName.equals(session.getName()))
-						return new StructuredSelection(
-								new Session[] { session });
-				}
-
-			}
-		}
-		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 String getObjectSelectionDisplayableString() {
-	  
-	  if (ejbBeanNames == null)
-		  return displayString_;
-	  
-	  int index = selectedBeanIndex == null ? 0 : selectedBeanIndex.intValue();
-	  String bean = (String) ejbBeanNames.get(index);
-	  return bean == null ? displayString_ : bean;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus getStatus()
-  {  	
-    if (selectedBeanIndex == null)
-    {
-    	return StatusUtils.errorStatus( "" );
-    }
-    
-  	return Status.OK_STATUS;
-  }
-  
-  public Point getWidgetSize() {
-	return new Point(450, 350);
-  } 
-    
-  private class EJBTableValues
-  {
-    Vector cachedEjbBeanNames;
-    Vector cachedEjbComponentNames;
-    Vector cachdedEjbComponentProjectNames; 
-  }
-  
-}
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 155b4f0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
+++ /dev/null
@@ -1,122 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524   141194 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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};
-    int columnsWidth[] = {60, 20};
-    int columnMins[] = {175, 125};
-    
-    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, SWT.NONE, i);
-      column.setText(columnProperties[i]);
-      column.pack();
-      layout.addColumnData(new ColumnWeightData(columnsWidth[i], columnMins[i], 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;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-  
-  private String handlerClassName;
-  private String handlerName;
-  private String portName;
-  private int index;
-  
-  private PortComponent port;
-  private Object handler;
-  private Object wsDescRef;
-
-  /**
-   * @return Returns the handlerClassName.
-   */
-  public String getHandlerClassName() {
-    return handlerClassName;
-  }
-  /**
-   * @param handlerClassName The handlerClassName to set.
-   */
-  public void setHandlerClassName(String handlerClassName) {
-    this.handlerClassName = handlerClassName;
-  }
-  /**
-   * @return Returns the handlerName.
-   */
-  public String getHandlerName() {
-    return handlerName;
-  }
-  /**
-   * @param handlerName The handlerName to set.
-   */
-  public void setHandlerName(String handlerName) {
-    this.handlerName = handlerName;
-  }
-  /**
-   * @return Returns the port.
-   */
-  public PortComponent getPort() {
-    return port;
-  }
-  /**
-   * @param port The port to set.
-   */
-  public void setPort(PortComponent port) {
-    this.port = port;
-  }
-  /**
-   * @return Returns the handler.
-   */
-  public Object getHandler() {
-    return handler;
-  }
-  /**
-   * @param handler The handler to set.
-   */
-  public void setHandler(Object handler) {
-    this.handler = handler;
-  }
-  /**
-   * @return Returns the portName.
-   */
-  public String getPortName() {
-    return portName;
-  }
-  /**
-   * @param portName The portName to set.
-   */
-  public void setPortName(String portName) {
-    this.portName = portName;
-  }
-
-  /**
-   * @return Returns the index.
-   */
-  public int getIndex() {
-    return index;
-  }
-  /**
-   * @param index The index to set.
-   */
-  public void setIndex(int index) {
-    this.index = index;
-  }
-  /**
-   * @return Returns the wsDescRef.
-   */
-  public Object getWsDescRef() {
-    return wsDescRef;
-  }
-  /**
-   * @param wsDescRef The wsDescRef to set.
-   */
-  public void setWsDescRef(Object wsDescRef) {
-    this.wsDescRef = wsDescRef;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index ab80c38..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ /dev/null
@@ -1,94 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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.swt.graphics.Point;
-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();
-  
-  /**
-   * 
-   * @return returns the string to displayed in the UI for the selected object
-   */
-  public  String getObjectSelectionDisplayableString();
-  
-  /**
-   * 
-   * @return returns the default initial size for the widget to be called from getInitialSize from any parent dialog
-   */
-  public Point getWidgetSize();
-  
-  /**
-   * 
-   * @param s A string representation of the object selection
-   * @return true if the string represents a valid object selection
-   */  
-  public boolean validate(String s);
-}
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 8e76b88..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070116   159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- *******************************************************************************/
-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.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-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));
-      }
-      else if (sel instanceof ServiceImplBean)
-      {
-        return new StructuredSelection(getBeanName((ServiceImplBean) sel));
-      }
-      else if(sel instanceof ServletLink)
-      {
-        return new StructuredSelection(getBeanName((ServletLink) sel));
-      }
-    }
-    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;
-  }
-  
-  private String getBeanName(ServiceImplBean bean) {
-    EObject eObject = bean.eContainer();
-    if (eObject instanceof PortComponentImpl) {
-      PortComponentImpl pci = (PortComponentImpl) eObject;
-      return pci.getServiceEndpointInterface();	      	
-    }
-    return "";
-  }
-  
-  private String getBeanName(ServletLink link) {    
-    EObject eObject = link.eContainer();
-    if (eObject instanceof ServiceImplBean)
-      return getBeanName((ServiceImplBean) eObject);
-    return "";
-  }
-}
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 b8d401a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,281 +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.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;
-  }
-  
-  public String getObjectSelectionDisplayableString() {
-	// TODO Auto-generated method stub
-    return "Java bean string ";
-  }
-}
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 ec77dc7..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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;
-        }
-      }
-    }
-  }
-}
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 5378e11..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060830   155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- * 20070116   159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070326   171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- *******************************************************************************/
-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.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.util.UniversalPathTransformer;
-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_;
-  
-  private boolean                topDown_ = false;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    // Transformation
-    if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
-    {
-      Transformer transformer          = ObjectSelectionRegistry.getInstance().getTransformer(objectSelectionWidgetId_);
-      Object      transformedSelection = transformer == null ? null : transformer.transform(objectSelection_);
-      
-      if (transformedSelection instanceof IStructuredSelection)
-      {
-        objectSelection_ = (IStructuredSelection)transformedSelection;
-      }
-    }
-	
-    // Validation
-    IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS;
-    if (status.getSeverity() != Status.OK && env != null)
-    {
-      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";
-          topDown_ = true;
-        }
-        else
-        {
-          objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
-        }        
-        
-		    objectSelectionWidgetId_ = objectSelectionWidgetId;
-        
-		    Object object = ObjectSelectionRegistry.getInstance().getSelectionWidget(objectSelectionWidgetId_);
-        
-        if( object instanceof IObjectSelectionWidget )
-        {
-          objectSelectionWidget_ = (IObjectSelectionWidget)object;
-        }
-      }
-    }
-  }
-
-  /**
-   * @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()
-  {
-    if (project_ == null && topDown_)
-      project_ = getProjectFromTransformedSelection();
-    return project_;
-  }
-  
-  public void setProject(IProject project)
-  {
-    this.project_ = project;
-  }  
-  
-  public String getComponentName()
-  {
-    if (componentName_ == null && topDown_)
-      componentName_ = getComponentNameFromTransformedSelection();
-    return componentName_;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName_ = componentName;
-  }
-
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    return parser_;
-  }
-  
-  private boolean hasProtocol(String url) { 
-    return url.indexOf(":") != -1;  
-  }
-  
-  private IResource findResourceFromSelection(Object selection) throws CoreException {
-	  
-      IResource resource = ResourceUtils.getResourceFromSelection(selection); 
-	  
-      // try finding at least the project using the EMF way
-      if (resource == null && selection instanceof EObject)
-          resource = ProjectUtilities.getProject(selection);
-	  
-      return resource;
-  }
-  
-  private IProject getProjectFromTransformedSelection() {
-    if (objectSelection_ != null && objectSelection_.size() == 1)
-    {
-      Object obj = objectSelection_.getFirstElement();
-      if (obj instanceof String) {
-        String str = UniversalPathTransformer.toPath((String) obj);
-        if (hasProtocol(str)) return null;
-        return ResourceUtils.getProjectOf(new Path(str));
-      }
-    }
-    return null;	  
-  }
-  
-  private IProject getProjectFromObjectSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = findResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          if (resource instanceof IProject)
-        	return (IProject) resource;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-			e.printStackTrace();
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromTransformedSelection() {
-    if (objectSelection_ != null && objectSelection_.size() == 1)
-    {
-      Object obj = objectSelection_.getFirstElement();
-      if (obj instanceof String) { 
-        String str = UniversalPathTransformer.toPath((String) obj);
-        if (hasProtocol(str)) return null;
-        IVirtualComponent comp = ResourceUtils.getComponentOf(new Path(str));
-        return comp == null ? null : comp.getName();
-      }
-    }
-    return null;	  
-  }
-  
-  private String getComponentNameFromObjectSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = findResourceFromSelection(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;
-  }  
-}
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 e6b2918..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,157 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20060830   155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-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.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class ObjectSelectionRegistry
-{
-  private static ObjectSelectionRegistry instance;
-  private IConfigurationElement[]        elements;
-  private Hashtable                      cachedSelectionWidgets;
-  
-  private ObjectSelectionRegistry()
-  {
-    elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
-    cachedSelectionWidgets = new Hashtable();    
-  }
-  
-  public static ObjectSelectionRegistry getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new ObjectSelectionRegistry();
-    }
-    
-    return instance;
-  }
-  
-  /**
-   * 
-   * @param id if the selection widget object.
-   * @return returns the transformer class if has been specified.  Otherwise
-   * null is returned.
-   */
-  public Transformer getTransformer( String id )
-  {
-    TableEntry  entry  = getTableEntry( id );
-    Transformer result = null;
-    
-    if( entry != null )
-    {
-      try
-      {
-        Object object = entry.element.createExecutableExtension("transformer");
-        
-        if( object instanceof Transformer )
-        {
-          result = (Transformer)object;
-        }
-      }
-      catch( CoreException exc ){}     
-    }
-    
-    return result;
-  }
-  
-  /**
-   * 
-   * @param id if the selection widget object.
-   * @return returns the value of the external modify attribute if
-   * it has been specified.  Otherwise false is returned.
-   */
-  public boolean getExternalModify( String id )
-  {
-    TableEntry entry  = getTableEntry( id );
-    boolean    result = false;
-    
-    if( entry != null )
-    {
-      String modifyString = entry.element.getAttribute("external_modify"); 
-      
-      result = new Boolean( modifyString ).booleanValue();
-    }
-    
-    return result;
-  }
-  
-  /**
-   * Gets the IObjectSelectionWidget based on the selectionId.  If one is
-   * not found null is returned.
-   * 
-   * @param selectionId the ID of the selection widget.
-   * @return returns the registered IObjectSelectionWidget object.
-   */
-  public Object getSelectionWidget( String selectionId )
-  {
-    TableEntry entry = getTableEntry( selectionId );
-    
-    return entry == null ? null : entry.objectSelection;
-  }
-  
-  public void cleanup()
-  {
-    instance = null;
-    elements = null;
-    cachedSelectionWidgets = null;
-  }
-  
-  private TableEntry getTableEntry( String id )
-  {
-    if( id == null ) return null;
-    
-    TableEntry entry = (TableEntry)cachedSelectionWidgets.get( id );
-    
-    if( entry == null )
-    {
-      for( int index = 0; index < elements.length; index++ )
-      {
-        IConfigurationElement element = elements[index];
-        String                elemId  = element.getAttribute( "id" );
-      
-        if( id.equals( elemId ) )
-        {
-          try
-          {
-            Object object = element.createExecutableExtension("class");
-            
-            if( object instanceof IObjectSelectionWidget || object instanceof IObjectSelectionLaunchable )
-            {
-              entry = new TableEntry();
-              entry.element = element;
-              entry.objectSelection = object;
-              cachedSelectionWidgets.put( id, entry );
-              break;
-            }
-          }
-          catch( CoreException exc ){}
-        }
-      }
-    }
-    
-    return entry;
-  }
-  
-  private class TableEntry
-  {
-    public IConfigurationElement  element;
-    public Object                 objectSelection;
-  }
-}
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 1a1a597..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060224   129387 pmoogk@ca.ibm.com - Peter Moogk
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061220   161232 makandre@ca.ibm.com - Andrew Mak, AbstractObjectSelectionWidget.setInitialSelection(IStructuredSelection initialSelection) called twice each time Browse pressed
- *******************************************************************************/
-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.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.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.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 Composite parent;
-  private Listener statusListener;
-  private Composite composite;
-  private IProject project;
-  private String componentName;
-  private IObjectSelectionWidget child;
-  private Point widgetSize_;
-  
-  public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
-  {
-    this.parent = parentComposite;
-    this.statusListener = statListener;
-    composite = null;
-    return this;
-  }
-  
-  public Control getControl(){
-	  return composite;
-  }
-  
-  /**
-   * @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();
-        }
-
-        Object object = ObjectSelectionRegistry.getInstance().getSelectionWidget( objectSelectionWidgetId );
-        
-        if( object instanceof IObjectSelectionWidget )
-        {
-          child = (IObjectSelectionWidget)object;
-        }
-        
-        if( child != null )
-        {
-          Control shell = parent.getShell();
-          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.addControls(composite, statusListener);
-
-          Point origSize = shell.getSize();
-          Point compSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-          int   newX     = origSize.x;
-          int   newY     = origSize.y;
-                  
-          // Note: we are trying to determine here if the wizard page should
-          //       be resized based on the size of the control that is
-          //       given to us by the extension.  The hard coded constants
-          //       below represent the vertical and horizontal pixels that need
-          //       to go around object selection control.  Hopefully, a more
-          //       programatic method of doing this can be found in the future.
-          if( compSize.x + 20 > origSize.x )
-          {
-            newX = compSize.x + 20;
-          }
-                  
-          if( compSize.y + 205 > origSize.y )
-          {
-            newY = compSize.y + 205;
-          }
-   
-          widgetSize_ = new Point(newX, newY);                  
-                  
-          return;
-        }
-      }
-    }
-  }
-  
-  public IStatus getStatus()
-  {
-    return (child != null) ? child.getStatus() : Status.OK_STATUS;
-  }
-
-  public void setInitialSelection(IStructuredSelection 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;    
-  }
-  
-  public String getObjectSelectionDisplayableString() {
-	return child.getObjectSelectionDisplayableString();    
-  }
-  
-  public Point getWidgetSize()
-  {
-	  Point childWidgetSize = child.getWidgetSize();
-	  if (childWidgetSize == null)
-		  	  return widgetSize_;
-	  return childWidgetSize;
-  }
-}
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 165067d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,75 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060803   152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- *******************************************************************************/
-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 final long ONE_SECOND = 1000;
-  private long refreshTime;
-  private boolean isRunning = true;
-  private Display display;
-  private Runnable runnable;
-
-  private Timer(Display display, Runnable runnable)
-  {
-    this.display = display;
-    this.runnable = runnable;
-  }
-
-  public synchronized static Timer newInstance(Timer timer, Display display, Runnable runnable)
-  {
-    if (!Timer.isRunning(timer))
-      return new Timer(display, runnable);
-    
-    return timer;
-  }
-  
-  public synchronized static boolean isRunning(Timer timer)
-  {
-    return timer != null && timer.isRunning;
-  }
-
-  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();
-    }
-    isRunning = false;
-    display.syncExec(runnable);
-  }
-}
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 e27ee08..0000000
--- 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 177f5dc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
+++ /dev/null
@@ -1,244 +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
- * -------- -------- -----------------------------------------------------------
- * 20060310   131352 pmoogk@ca.ibm.com - Peter Moogk
- * 20060411   136134 kathy@ca.ibm.com - Kathy Chan
- * 20060420   136221 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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.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.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_[] = {ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_SEVERITY,
-	  								ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_LINE,
-	  								ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_COLUMN,
-	  								ConsumptionUIMessages.TABLE_COLUMN_VALIDATION_MESSAGE};
-  static final int columnsWidth_[] = {12, 10, 10, 60};
-  static final int columnMins_[] = {60, 50, 50, 300};
-
-  
-
-  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));
-	
-    Text messageLabel = new Text( composite, SWT.READ_ONLY);
-    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], columnMins_[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 3fcf524..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070116   159618 makandre@ca.ibm.com - Andrew Mak, Project and EAR not defaulted properly when wizard launched from JSR-109 Web services branch in J2EE Project Explorer
- * 20070327   172339 kathy@ca.ibm.com - Kathy Chan
- * 20070713   191357 kathy@ca.ibm.com - Kathy Chan
- * 20081208   257618 mahutch@ca.ibm.com - Mark Hutchinson, Add Mechanism for Adopters to map Services to WSDL URLs
- * 20090310   242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-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.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-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.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsfinder.WSDLURLStringWrapper;
-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)
-    {
-     IStructuredSelection selection = (IStructuredSelection)value;
-     if (selection != null && !selection.isEmpty()) {
-     
-      Object sel = selection.getFirstElement();
-      if (sel instanceof IResource)
-      {
-        try
-        {
-          if (sel instanceof IFile)
-          {
-        	IFile file = (IFile)sel;
-        	IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
-        	if (converter != null)
-        	{
-        	  String wsdlUrl = converter.convert(file);
-        	  if (wsdlUrl != null || !converter.allowBaseConversionOnFailure())
-        	    return wsdlUrl;
-        	}
-          }
-          return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-      else if (Platform.getAdapterManager().hasAdapter(sel, WSDLURLStringWrapper.class.getName())) {
-    	Object adaptedObject = Platform.getAdapterManager().loadAdapter(sel, WSDLURLStringWrapper.class.getName());
-    	WSDLURLStringWrapper wrapper = (WSDLURLStringWrapper)adaptedObject;
-    	return new StructuredSelection(wrapper.getWSDLURLString());  		
-      }
-      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));
-      }
-      /*
-       * TODO - Remove the cases below after bug 170834 is fixed
-       * 
-       * WSDLSelectionTransformer should not need to handle ServiceImplBean and BeanLink which
-       * represent service classes.  These catches are here for now since we incorrectly allow
-       * the wizard to default to top-down sceanrio when launch from these objects in the JSR-109
-       * branch. 
-       */
-      else if (sel instanceof ServiceImplBean)
-      {
-        return new StructuredSelection(getWSDLURI((ServiceImplBean) sel));
-      }
-      else if (sel instanceof BeanLink)
-      {
-        return new StructuredSelection(getWSDLURI((BeanLink) sel));
-      } else {
-    	  String wsdlURI = AdapterUtils.getAdaptedWSDL(sel);
-    	  if (wsdlURI != null) {
-    		  return new StructuredSelection(wsdlURI);
-    	  }
-      }
-     }
-    }
-    return value;
-  }
-  
-  private String getWSDLURI(ServiceImplBean bean) {
-	  EObject eObject = bean.eContainer();
-	  if (eObject == null)
-		  return "";
-          
-	  eObject = eObject.eContainer();
-      
-	  if (eObject instanceof WebServiceDescription) {
-		  WebServiceDescription wsd = (WebServiceDescription) eObject;
-		  IProject project = ProjectUtilities.getProject(wsd);    	  
-    	  
-		  // getWebContentPath returns the "WebContent" folder path for Web projects
-		  // for EJB projects, it returns the "ebjModule" folder path
-		  IPath path = J2EEUtils.getWebContentPath(project);    	 
-		  path = path.append(wsd.getWsdlFile()); 
-    	  
-		  return path.toString();    	    
-	  }
-	  return "";
-  }
-  
-  private String getWSDLURI(BeanLink link) {
-	  EObject eObject = link.eContainer();
-	  if (eObject instanceof ServiceImplBean)
-		  return getWSDLURI((ServiceImplBean) eObject);
-	  return "";
-  }
-}
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 5279a28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410   136011 kathy@ca.ibm.com - Kathy Chan
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- * 20060504   119296 pmoogk@ca.ibm.com - Peter Moogk
- * 20060525   142281 joan@ca.ibm.com - Joan Haggarty
- * 20060607   144932 kathy@ca.ibm.com - Kathy Chan
- * 20060612   145081 pmoogk@ca.ibm.com - Peter Moogk
- * 20060719   139977 kathy@ca.ibm.com - Kathy Chan
- * 20060803   152701 cbrealey@ca.ibm.com - Chris Brealey
- * 20060803   152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060825   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060831   155883 makandre@ca.ibm.com - Andrew Mak, service impl field doesn't work after switching from BU to TD
- * 20061106   142500 david.schneider@unisys.com - David Schneider, WTP properties pages fonts don't follow Eclipse preferences
- * 20061211   161589 makandre@ca.ibm.com - Andrew Mak, NPE in service generation after opening and cancelling from browse dialog
- * 20070131   168786 makandre@ca.ibm.com - Andrew Mak, wsdl url on web service wizard page 1 is not reflected in browse dialog
- * 20070326   171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20090310   242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-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.dialogs.Dialog;
-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.TimedWSDLSelectionConditionCommand;
-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.graphics.Point;
-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.converter.IIFile2UriConverter;
-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.ws.internal.util.UniversalPathTransformer;
-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 String wsdlURI_;
-  
-  private Composite parent_;
-  private Listener  statusListener_;
-  private ModifyListener modifyListener_;
-  private WSDLSelectionTreeWidget tree;
-  
-  private Timer timer_ = null;
-  
-  /*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_;
-  
-  /*CONTEXT_ID PCON0006 for the Stop Wizard WSDL Validation button of the WSDL Selection Page*/
-  private Button stopValidationButton_;
-  private final String INFOPOP_PCON_BUTTON_STOP_VALIDATION = "PCON0006";
-  
-  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());
-		  setValidationInProgress(false);
-      }
-    };
-    
-    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 );
-    modifyListener_ =
-      new ModifyListener()
-      {
-        public void modifyText(ModifyEvent event)
-        {
-          handleWebServiceURIModifyEvent();
-        }
-      };
-    
-    webServiceURI.addModifyListener(modifyListener_);
-    
-//    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(SWT.FILL, SWT.FILL, false, false);
-    validationSummaryText_.setLayoutData(gd1);
-    validationSummaryText_.setToolTipText( ConsumptionUIMessages.TOOLTIP_VALIDATE_TEXT_MESSAGE_SUMMARY );
-    
-    validationSummaryText2_ = new Text( parent, SWT.WRAP);
-    validationSummaryText2_.setEditable(false);
-    validationSummaryText2_.setLayoutData(gd1);
-    
-    stopValidationButton_ = uiUtils.createPushButton(parent, 
-    			ConsumptionUIMessages.LABEL_BUTTON_STOP_WSDL_VALIDATION, 
-    			ConsumptionUIMessages.TOOLTIP_STOP_VALIDATION_BUTTON, 
-    			INFOPOP_PCON_BUTTON_STOP_VALIDATION);
-    setValidationInProgress(false);
-    
-    stopValidationButton_.addSelectionListener(
-    		new SelectionListener()
-    		{
-    			public void widgetDefaultSelected(SelectionEvent event)
-    			{
-    				handleStopValidationButton();
-    			}
-
-    			public void widgetSelected(SelectionEvent event)
-    			{
-    				handleStopValidationButton();
-    			} 
-    		});
-    
-    setMessageSummary();
-    Dialog.applyDialogFont(parent);    
-    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_ = Timer.newInstance(timer_, Display.getCurrent(), this);
-      timer_.startTimer();
-    }
-    else
-      handleWebServiceURI();
-    statusListener_.handleEvent(null);
-  }
-  
-  private void handleWebServiceURI() {
-	  handleWebServiceURI(webServiceURI.getText());
-  }
-  
-  private void handleWebServiceURI(String wsURI)
-  {    
-    if (wsURI.indexOf(':') < 0)
-    {
-      IFile file = uri2IFile(wsURI);
-      if (file != null)
-        wsURI = iFile2URI(file);
-    }
-    if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
-    {
-      TimedWSDLSelectionConditionCommand cmd = new TimedWSDLSelectionConditionCommand();
-      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();  
-    wsdlURI_ = wsURI;
-  }
-  
-  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 )
-    {
-    	wsdlURI_ = res.getFullPath().toString();
-    	webServiceURI.setText( wsdlURI_ );    	
-    }
-    	
-    statusListener_.handleEvent(null);
-  }
-  
-  private void setValidationInProgress(boolean validating) {
-	  stopValidationButton_.setEnabled(validating);
-  }
-  
-  private void handleStopValidationButton()
-  {
-	  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) { 
-				  existingValidateWSDLJob.cancel();
-			  }
-		  }
-	  }
-	  clearValidationMessages();
-	  setValidationInProgress(false);
-  }
-  
-  private void clearValidationMessages() {
-	  msgViewer_.clearInput();
-	  validationSummaryText_.setText(" " );
-	  validationSummaryText2_.setText(" ");
-  }
-  
-  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 ) {
-    	clearValidationMessages();
-    	return StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_INVALID_WEB_SERVICE_URI );
-    }
-    else if( wsPath.indexOf(':') < 0 )
-    {
-    	IResource res = ResourceUtils.findResource(wsPath);
-    	if( res == null ) {
-    		clearValidationMessages();
-    		return StatusUtils.errorStatus( NLS.bind(ConsumptionUIMessages.PAGE_MSG_NO_SUCH_FILE, new Object[] {wsPath}) );
-    	}
-    	else if( res.getType() != IResource.FILE ) {
-    		clearValidationMessages();
-    		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(timer_) && tree.isEnabled())
-    {
-      IStatus status = tree.getStatus();
-      if (status != null)
-      {
-        int severity = status.getSeverity();
-        if (severity == Status.ERROR || severity == Status.WARNING) {
-        	clearValidationMessages();
-        	return status;
-        }
-      }
-    }
-    else
-    {
-    	if( wsPath.indexOf(':') < 0 )
-        {
-          String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-          if (webServicesParser.getWSDLDefinition(wsdlURI) == null) {
-        	  clearValidationMessages();
-        	  return StatusUtils.errorStatus(ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-          }
-        }
-    }
-    
-    
-    if (!Timer.isRunning(timer_)) {
-    	String wsdlURI1 = wsPath;
-    	 boolean isRemote = true;
-    	if (tree.isEnabled()) { // is wsil
-    		wsdlURI1 = tree.getWsdlURI();
-    		if (wsdlURI1.startsWith("file:") || wsdlURI1.startsWith("platform:"))
-    		{
-    			isRemote = false;
-    		}
-    	} else {
-    		if (wsPath.indexOf(':') < 0)
-    		{
-    			isRemote = false;
-    			wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-    		}
-    		else if (wsPath.startsWith("file:") || wsPath.startsWith("platform:"))
-    		{
-    			isRemote = false;
-    		}
-    	}
-  	  
-      setMessageSummary();
-	  msgViewer_.clearInput();
-  	  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();
-						  setValidationInProgress(false);
-					  } else {						  
-						  startWSDLValidation = false;
-					  }
-				  } 
-			  }
-		  } 
-		  
-		  if (startWSDLValidation) {
-			  startWSDLValidationJob(wsdlURI);
-		  }
-	  }
-	  return;
-  }
-  
-  private void startWSDLValidationJob (String wsdlURI) {
-	  validateWSDLJob_ = new ValidateWSDLJob(wsdlURI);
-	  validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ );
-	  validateWSDLJob_.schedule();
-	  setValidationInProgress(true);
-  }
-  
-  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)
-  {
-	String uri = null;
-	IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
-	boolean allowBaseConversionOnFailure = true;	
-	if (converter != null)
-	{
-		uri = converter.convert(file);
-		if (uri == null)
-			allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
-	}
-	if (uri == null && allowBaseConversionOnFailure)
-	{
-  	  File f = file.getLocation().toFile();
-      try
-      {
-        uri = f.toURL().toString();
-      }
-      catch (MalformedURLException murle)
-      {
-    	uri = f.toString();
-      }
-	}
-    return uri;
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      String wsdlURI = toWsdlURI(object);  
-      wsdlURI_ = wsdlURI;
-      
-      if (wsdlURI != null && webServiceURI != null)
-      {
-        handleWebServiceURI(wsdlURI);
-    	
-        webServiceURI.removeModifyListener(modifyListener_);
-        webServiceURI.setText(getObjectSelectionDisplayableString());       
-        webServiceURI.addModifyListener(modifyListener_);
-      }
-    }  
-  }
-  
-  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()
-  {
-	  StructuredSelection ss; 
-	  if (tree != null && tree.getWsdlURI() != null)
-		  ss = new StructuredSelection(tree.getWsdlURI());
-	  else
-		  ss = new StructuredSelection(wsdlURI_);
-	return new StructuredSelection( 
-               new WSDLSelectionWrapper( webServicesParser, ss));
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return webServicesParser;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  public IProject getProject()
-  {
-	String wsdlURI;
-
-	if (tree != null)
-       wsdlURI = tree.getWsdlURI();
-	else
-		wsdlURI = wsdlURI_;
-	
-    if (wsdlURI != null)
-    {
-      IProject p = getProjectFromURI(wsdlURI);
-      if (p!=null && p.exists())
-        return p;
-      
-      String wsRelPath = wsdlURI_;
-      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;
-    if (tree != null)
-    	wsdlURI = tree.getWsdlURI();
-    else 
-    	wsdlURI = wsdlURI_;
-    
-    if (wsdlURI != null)
-    {
-      String cname = getComponentNameFromURI(wsdlURI);
-      if (cname!=null && cname.length()>0)
-        return cname;
-      
-      String wsRelPath = wsdlURI_;
-      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;    
-  }
-  
-  public String getObjectSelectionDisplayableString() 
-  {	
-    if (tree != null)
-    {
-      return UniversalPathTransformer.toPath(tree.getWsdlURI());
-    }
-    else
-    {
-	    return UniversalPathTransformer.toPath(wsdlURI_);
-    }
-	}
-  
-  public Point getWidgetSize() {	
-	  return new Point( 580, 580);  
-  }
-  
-  public boolean validate(String s) {
-	  String wsURI = s;
-	    
-	    if (wsURI.indexOf(':') < 0)
-	    {
-	      IFile file = uri2IFile(wsURI);
-	      if (file != null)
-	        wsURI = iFile2URI(file);
-	    }
-	    if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
-	    {
-	      TimedWSDLSelectionConditionCommand cmd = new TimedWSDLSelectionConditionCommand();
-	      cmd.setWebServicesParser(webServicesParser);
-	      cmd.setWebServiceURI(wsURI);
-	      cmd.execute(null, null);
-	    }
-		
-	    // prime widget based on the string
-	    wsdlURI_ = wsURI;
-	    if (tree != null)
-	    	tree.setWebServiceURI(wsURI);
-	    
-	    WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
-	    if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
-             return true;
-	    else
-	    	return false;
-	    
-  } 
-}
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 80a6c18..0000000
--- 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/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 e9fe9d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation. - initial API and implementation
- * 20070523   158230 kathy@ca.ibm.com - Kathy Chan
- * 20080326   171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402   225032 makandre@ca.ibm.com - Andrew Mak
- * 20080415   227152 makandre@ca.ibm.com - Andrew Mak, Need a way to specify a backup Web service runtime
- * 20080421   228054 makandre@ca.ibm.com - Andrew Mak, NPE in ClientRuntimeSelectionWidgetDefaultingCommand
- * 20080527   234226 kathy@ca.ibm.com - Kathy Chan
- * 20080731   242721 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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.ILog;
-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.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.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.RuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-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.WSUIPluginMessages;
-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.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.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.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 String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";
-  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 initial projects ...
-  //The difference between clientInitialProject_ and initialProject_ is that
-  //clientInitialProject_ comes from the ObjectSelectionOutputCommand while initialProject_
-  //comes from SelectionCommand (i.e. it is the project containing the thing that was selected before 
-  //the wizard was launched). In the defaulting algorithm, clientInitialProject_ will 
-  //be given first priority. If, however, it is deemed that clientInitialProject_ is not a valid project 
-  //because it contains the J2EE Web service for which we are trying to create a client, initialProject_
-  //will be given second priority.
-  private IProject initialProject_; //This is the project containing the selection prior to the wizard being launched.
-  private IProject clientInitialProject_; //This is the project containing the object selection from page 2.
-  private String wsdlURI_;
-  private WebServicesParser parser_;  
-
-  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_;    
-  }
-  
-  /**
-   * Defaults the following bits of information in the following order:
-   * clientRuntimeId_ : the clientRuntimeId. Must be defaulted to non-empty String.
-   * clientIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String.
-   * clientProjectName_ : the name of the client project. Must be non-empty. May or may not exist.
-   * clientComponentType_: the id of the client project template. Must be empty if the client
-   *                        project exists. Must be non-empty of the client project does not exist.
-   * clientIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime
-   *                        does not require a server.
-   * clientIds_.serverInstanceId_: the server id. May be null or an empty String.
-   * clientNeedEAR_: true if an EAR is needed. False otherwise.
-   * clientEarProjectName_: the client EAR project. Must be empty if the clientNeedEAR_ is false.
-   *                         Must be non-empty if the clientNeedEAR_ is true.
-   * webServiceClient_ : the IWebServiceClient based on the calculated defaults. Must be non-null for "Next"
-   *                     button to be enabled on the page following this command.
-   * context_ : an IContext. Must be non-null for "Next" button to be enabled on the page following this command.                         
-   */  
-  public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable)
-  {
-
-    IEnvironment env = getEnvironment();
-
-    try
-    {
-      
-      //**Step 1** Default the Web service runtime.
-    	
-      //clientIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard
-      //scenarios.
-      if (clientIdsFixed_ && (clientProjectName_ == null))
-      {
-        // Set the clientRuntime based on the runtime, server, and initial
-        // selection.
-        DefaultRuntimeTriplet drt = getDefaultClientRuntimeForFixedRuntimeAndServer(clientInitialProject_, clientIds_.getServerId());
-        clientFacetMatcher_ = drt.getFacetMatcher();
-        clientProjectName_ = drt.getProjectName();
-        clientRuntimeId_ = drt.getRuntimeId();        
-      } 
-      else      
-      {	
-        ValidationUtils vu = new ValidationUtils();
-        
-        // Set the runtime based on the project containing the object selection/initial selection.
-        DefaultRuntimeTriplet drt = null;
-        
-        if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_) && !clientIdsFixed_)
-        {
-          //If clientIntialProject_ does not contain the J2EE Web service, choose a clientRuntime based on it.
-          drt = getDefaultRuntime(clientInitialProject_, clientIds_.getTypeId(), true, clientIds_.getServerId());
-          clientFacetMatcher_ = drt.getFacetMatcher();
-          clientProjectName_ = drt.getProjectName(); 
-          clientRuntimeId_ = drt.getRuntimeId();          
-        }
-        else
-        {
-          //clientInitialProject_ contains the J2EE Web service so don't use it.
-          //Try using the initalProject_ instead.
-          if (!vu.isProjectServiceProject(initialProject_, wsdlURI_, parser_) && !clientIdsFixed_)
-          {
-            //If intialProject_ does not contain the J2EE Web service, choose a clientRuntime based on it.
-            drt = getDefaultRuntime(initialProject_, clientIds_.getTypeId(), true, clientIds_.getServerId());
-            clientFacetMatcher_ = drt.getFacetMatcher();
-            clientProjectName_ = drt.getProjectName();
-            clientRuntimeId_ = drt.getRuntimeId();            
-          }
-          else
-          {
-            //Both clientIntialProject_ and initialProject_ contain the J2EE Web service
-            //and cannot be used to influence clientRuntime defaulting.
-            //Choose a clientRuntime but don't choose clientInitialProject_
-            //as the clientProject.
-            drt = getDefaultRuntime(null, clientIds_.getTypeId(), true, clientIds_.getServerId());
-            clientRuntimeId_ = drt.getRuntimeId();                      
-          }
-        }
-
-        //Set the Web service runtime id from the clientRuntime
-        clientIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(clientRuntimeId_).getRuntime()
-            .getId());
-      }
-      
-      //**Step 2** Default the client project if it was not already defaulted 
-      //as part of defaulting the Web service runtime.
-      if (clientProjectName_ == null)
-      {
-        // Project name did not get set when the runtime was set, so set it now
-        clientProjectName_ = getDefaultClientProjectName();
-      }
-
-      //**Step 3** Default the client project type.      
-      IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-      if (!clientProject.exists())
-      {
-        // Set the project template
-        clientComponentType_ = getDefaultClientProjectTemplate();
-      }
-      else
-      {
-        //Set it to an empty String
-        clientComponentType_ = "";
-      }
-
-
-      //**Step 4** Default the client server if this is not an Ant scenario.
-      if (!clientIdsFixed_)
-      {
-        IStatus serverStatus = setClientDefaultServer();
-        if (serverStatus.getSeverity() == Status.ERROR)
-        {
-          env.getStatusHandler().reportError(serverStatus);
-          return serverStatus;
-        }
-      }
-      
-      //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed
-      setDefaultClientEarProject();      
-      
-      
-      //**Step 6** Calculate default IWebServiceClient. This is need to make sure that
-      // Next is enabled on the page following this command.
-      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);
-        
-      // If the exception has no error msg, it's kind of useless to the user so let's log it
-      if ( e.getMessage() == null){
-        ILog pluginlog = WebServiceConsumptionUIPlugin.getInstance().getLog();
-        pluginlog.log(errorStatus);
-        	  
-        // create a new IStatus which has a non-null msg, this is to be thrown to the user.
-        errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
-      	       new String[] { WSUIPluginMessages.MSG_SEE_ERROR_LOG }), 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;
-          }
-        }
-      } else {  // serverId == null, assume that it does not need EAR
-    	  clientNeedEAR_ = false;
-    	  
-      }
-    }
-    
-    if (clientNeedEAR_)
-    {
-    	clientEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(clientProjectName_);
-    }
-    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 && configuredServers[0].getServerType() != null)
-    {
-      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 && server.getServerType() != 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 && server.getServerType() != 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 if the default Web service
-    // runtime requires a server.
-    RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(clientIds_.getRuntimeId());
-    if (runtimeDescriptor.getServerRequired())
-    {
-      String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(clientIds_.getRuntimeId());
-      IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[] {
-          runtimeLabel}));
-      return status;
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  private IServer getServerFromClientRuntimeId()
-  {
-    IServer[] servers = ServerCore.getServers();
-    if (servers != null && servers.length > 0) {
-    	
-        PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-        String preferredServerFactoryId = context.getServerFactoryId();
-        
-        //If a server of the preferred server type is present, check that one first
-        for (int j = 0; j < servers.length; j++)
-        {
-          if (servers[j] != null && servers[j].getServerType() != null)
-          {
-	          String serverFactoryId = servers[j].getServerType().getId();
-	          if (serverFactoryId.equals(preferredServerFactoryId))
-	          {
-	            if (WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportServer(clientRuntimeId_, serverFactoryId))
-	            {
-	              return servers[j];
-	            }
-	          }
-          }
-        }
-        
-        //A server of the preferred server type could not be found or did not match. Check all the existing servers.    
-    	
-      for (int i = 0; i < servers.length; i++)
-      {
-    	if (servers[i] != null && servers[i].getServerType() != null)
-    	{
-	        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)
-    {
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String preferredServerFactoryId = context.getServerFactoryId();
-        
-      // 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.getPrimaryRuntime();
-          }
-        } catch (CoreException ce)
-        {
-
-        }
-      }
-
-      if (fRuntime != null)
-      {
-        // Get an existing server that has the same runtime.
-        IServer firstMatchingServer = null;    	  
-        IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-        for (int i = 0; i < servers.length; i++)
-        {
-          IServer thisServer = servers[i];
-          IRuntime thisServerRuntime = thisServer.getRuntime();
-          if ( thisServerRuntime != null && sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
-          {
-            if (firstMatchingServer==null)
-            {
-              firstMatchingServer = thisServer;
-            }
-              
-            if (thisServer != null && thisServer.getServerType() != null && thisServer.getServerType().getId().equals(preferredServerFactoryId))
-            {
-        	  
-              server = thisServer;
-              break;
-            }
-          }
-        }
-                
-        //If a server of the preferred server type was not found but
-        //there was a server that matched, return that one.
-        if (server == null && firstMatchingServer != null)
-        {
-          server = firstMatchingServer;
-        }        
-      }
-
-      // 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 != null && 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();
-	    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-	    String preferredServerFactoryId = context.getServerFactoryId();
-	    
-	    //If one of the servers is of the preferred type, and its runtime
-	    //is in the set of matching runtimes, return that server.
-	    for (int j=0; j<servers.length; j++)      
-	    {
-	      IServer thisServer = servers[j];
-	      if (thisServer != null && thisServer.getServerType() != null && thisServer.getRuntime() != null && thisServer.getServerType().getId().equals(preferredServerFactoryId))
-	      {
-	    	IRuntime thisServerRuntime = thisServer.getRuntime();
-	        //Check to see if it matches any of the runtimes.
-	        Iterator runtimesItr = runtimes.iterator();
-	        while(runtimesItr.hasNext())
-	        {
-	          org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)runtimesItr.next();
-	          IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-	          if (sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
-	          {
-	            server = thisServer;
-	          }          
-	        }
-	      }            
-	    }
-	    
-	    if (server == null)
-	    {
-	      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];
-	          IRuntime thisServerRuntime = thisServer.getRuntime();
-	          if (thisServerRuntime != null && sRuntime != null && thisServerRuntime.getId().equals(sRuntime.getId()))
-	          {
-	            server = thisServer;
-	            break outer;
-	          }
-	        }
-	      }
-	    }
-
-	    return server;
-
-  }
-  
-  protected IServerType getServerTypeFromProject(String projectName, FacetMatcher facetMatcher)
-  {
-	    IServerType serverType = null;
-	    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-	    String preferredServerFactoryId = context.getServerFactoryId();
-	    
-	    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.getPrimaryRuntime();
-	        }
-	      } catch (CoreException ce)
-	      {
-	        
-	      }
-	    }
-	    
-	    if (fRuntime != null)
-	    {
-	      //Get a server type that has the same runtime type.
-	      IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); 
-	      if (sRuntime != null)
-	      {
-		      IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
-		      IServerType firstMatchingServerType = null;
-		      for (int i=0; i<serverTypes.length; i++)
-		      {
-		        IServerType thisServerType = serverTypes[i];
-		        IRuntimeType thisServerRuntimeType = thisServerType.getRuntimeType();
-		        if (sRuntimeType != null && thisServerRuntimeType != null && thisServerRuntimeType.getId().equals(sRuntimeType.getId()))
-		        {
-		          if (firstMatchingServerType == null)
-		          {
-		            firstMatchingServerType = thisServerType;
-		          }
-		          if (thisServerType.getId().equals(preferredServerFactoryId))
-		          {
-		            serverType = thisServerType;
-		            break;
-		          }
-		        }     
-		      }
-		      
-		      //If the preferred server type was not found but
-		      //there was a server type that matched, return that one.        
-		      if (serverType == null && firstMatchingServerType != null)
-		      {        
-		        serverType = firstMatchingServerType;
-		      }
-	      }
-	    }
-
-	    //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 != null && 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();
-	    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-	    String preferredServerFactoryId = context.getServerFactoryId();    
-
-	    //If one of the server types is of the preferred type, and its runtime
-	    //is in the set of matching runtimes, return that server type.
-	    for (int j=0; j<serverTypes.length; j++)      
-	    {
-	      IServerType thisServerType = serverTypes[j];
-	      IRuntimeType thisServerTypeRuntimeType = thisServerType.getRuntimeType();
-	      if (thisServerTypeRuntimeType != null && thisServerType.getId().equals(preferredServerFactoryId))
-	      {
-	        //Check to see if it matches any of the runtimes.
-	        Iterator runtimesItr = runtimes.iterator();
-	        while(runtimesItr.hasNext())
-	        {
-	          org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = (org.eclipse.wst.common.project.facet.core.runtime.IRuntime)runtimesItr.next();
-	          IRuntime sRuntime = FacetUtil.getRuntime(fRuntime);
-	          if (sRuntime != null)
-	          {
-	        	  IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
-		          if (sRuntimeType != null && thisServerTypeRuntimeType.getId().equals(sRuntimeType.getId()))
-		          {
-		            serverType = thisServerType;
-		          }          
-	          }
-	        }
-	      }            
-	    }
-	    
-	    
-	    if (serverType == null)
-	    {
-	      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);
-	        if (sRuntime != null)
-	        {
-		        IRuntimeType sRuntimeType = sRuntime.getRuntimeType();
-		        for (int i = 0; i < serverTypes.length; i++)
-		        {
-		          IServerType thisServerType = serverTypes[i];
-		          if (thisServerType != null)
-		          {
-			          IRuntimeType thisServerTypeRuntimeType = thisServerType.getRuntimeType();
-			          if (sRuntimeType != null && thisServerTypeRuntimeType != null && thisServerTypeRuntimeType.getId().equals(sRuntimeType.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());
-    
-    //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];            
-          }
-        }                                    
-      }      
-    }
-
-    //Since the preferredTemplateIds contains the union of all project types for all client runtimes, we are
-    //guaranteed to have returned by now, so the code below will never be executed under normal
-    //circumstances. Just return something to satisfy the compiler.    
-    if (templates.length > 0)
-      return templates[0];
-    
-    return "";
-  }
-  
-  private String getDefaultClientProjectName()
-  {
-    ValidationUtils vu = new ValidationUtils();
-    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++)
-    {
-      if (!vu.isProjectServiceProject(projects[i], wsdlURI_, parser_))
-      {
-        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 runtimePreferredServer)
-  {
-    String[] clientRuntimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(clientIds_.getTypeId(), runtimePreferredServer);
-    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, clientIds_.getServerId());
-    }
-  }  
-    
-  protected DefaultRuntimeTriplet getDefaultRuntime(IProject project, String typeId, boolean isClient, String runtimePreferredServer)
-  {
-    String[] runtimes = null;
-    if (isClient)
-    {
-      runtimes = WebServiceRuntimeExtensionUtils2.getClientRuntimesByType(typeId, runtimePreferredServer);
-    }
-    else
-    {
-      runtimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(typeId, runtimePreferredServer);
-    }
-        
-    //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();
-    String fallbackRuntimeId = context.getFallbackRuntimeId();
-    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 if (descRuntimeId.equals(fallbackRuntimeId)) 
-      {
-    	otherRuntimeIdsList.add(0, runtimes[k]);  // add to beginning of otherRuntimeIdsList
-      }
-      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. 
-    
-      //Use the preferred project types to influence the selection of a runtime.
-      ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-      String[] preferredTemplateIds = null;
-      if (isClient)
-      {
-        preferredTemplateIds = ptc.getClientTypes();  
-      }
-      else
-      {
-        preferredTemplateIds = ptc.getServiceTypes();
-      }
-      
-    
-      for (int n=0; n<preferredTemplateIds.length; n++)
-      {
-        String preferredTemplateId = preferredTemplateIds[n];
-
-        for (int m=0; m<preferredRuntimeIds.length; m++)
-        {
-          //If this client or service runtime supports this template, choose it and exit.        
-          boolean matches = false;
-          if (isClient)
-          {
-            matches = WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId);            
-          }
-          else
-          {
-            matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(preferredRuntimeIds[m], preferredTemplateId);
-          }
-          
-          if (matches)
-          {
-            DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-            drt.setFacetMatcher(null);
-            //If the project doesn't exist, use the name of the project that was passed in.
-            //If the project exists, it means that previous code in this method
-            //determined it to not be a suitable project. Clear the project name.
-            if (project==null || project.exists())
-            {
-              drt.setProjectName(null);
-            }
-            else
-            {
-              drt.setProjectName(project.getName());
-            }
-            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);
-      //If the project doesn't exist, use the name of the project that was passed in.
-      //If the project exists, it means that previous code in this method
-      //determined it to not be a suitable project. Clear the project name.      
-      if (project==null || project.exists())
-      {
-        drt.setProjectName(null);
-      }
-      else
-      {
-        drt.setProjectName(project.getName());
-      }
-      drt.setRuntimeId(preferredRuntimeIds[0]);
-      return drt;      
-    }
-      
-    if (otherRuntimeIds.length > 0)
-    {
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      //If the project doesn't exist, use the name of the project that was passed in.
-      //If the project exists, it means that previous code in this method
-      //determined it to not be a suitable project. Clear the project name.
-      if (project==null || project.exists())
-      {
-        drt.setProjectName(null);
-      }
-      else
-      {
-        drt.setProjectName(project.getName());
-      }
-      drt.setRuntimeId(otherRuntimeIds[0]);
-      return drt;
-    }
-    else
-    {
-      DefaultRuntimeTriplet drt = new DefaultRuntimeTriplet();
-      drt.setFacetMatcher(null);
-      //If the project doesn't exist, use the name of the project that was passed in.
-      //If the project exists, it means that previous code in this method
-      //determined it to not be a suitable project. Clear the project name.
-      if (project==null || project.exists())
-      {
-        drt.setProjectName(null);
-      }
-      else
-      {
-        drt.setProjectName(project.getName());
-      }
-      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;
-  }
-  
-  
-      
-  /*
-   * Set defaults for the client-side from the service-side if possible.
-   * Sets clientProjectName_ to a value based on the service project name.
-   * 
-   * Returns an IStatus.OK if the service side values for server and Web 
-   * service runtime can be used to set the values for clientRuntimeId_,
-   * clientComponentType_, all the values in clientIds_, and clientEarProjectName_.
-   * 
-   * Returns an IStatus.ERROR otherwise, leaving only the clientProjectName_ set. 
-   */
-  protected IStatus defaultClientSideFromServiceSide(String serviceProjectName, TypeRuntimeServer serviceIds, boolean serviceNeedEAR, String serviceEarProjectName)
-  {
-    //1. Start with setting the default client project name based on the service project name.
-    boolean isEJB = false;
-    String implId = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceIds.getTypeId());
-    isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
-    String[] updatedNames = ResourceUtils.getClientProjectComponentName(serviceProjectName, serviceProjectName, isEJB);
-    clientProjectName_ = updatedNames[0];
-    
-    //2. Ideally, the server and runtime on the client-side will be defaulted
-    //   to the same values as the service side. If a client runtime id that 
-    //   supports clientProjectName_ and the service-side server and runtime defaults
-    //   can be found, choose it.
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-    TypeRuntimeServer testIds = new TypeRuntimeServer();
-    testIds.setTypeId(clientIds_.getTypeId());
-    testIds.setRuntimeId(serviceIds.getRuntimeId());
-    testIds.setServerId(serviceIds.getServerId());
-    testIds.setServerInstanceId(serviceIds.getServerInstanceId());
-    
-    if (clientProject.exists())
-    {
-      clientComponentType_ = "";
-      clientRuntimeId_ = WebServiceRuntimeExtensionUtils2.getClientRuntimeId(testIds, serviceProjectName, clientComponentType_);
-      if (clientRuntimeId_ != null && clientRuntimeId_.length()>0)
-      {
-        clientIds_.setRuntimeId(serviceIds.getRuntimeId());
-        clientIds_.setServerId(serviceIds.getServerId());
-        clientIds_.setServerInstanceId(serviceIds.getServerInstanceId());
-      }      
-    }
-    else
-    {
-      //See if there is a client project type that supports the service-side
-      //server and runtime defaults. Pick a client project type based on project topology preferences.
-      //Choose the clientRuntimeId_ accordingly.
-      String[] templateIds = WebServiceRuntimeExtensionUtils2.getClientProjectTemplates(clientIds_.getTypeId(), testIds.getRuntimeId());
-      if (templateIds != null && templateIds.length > 0)
-      {
-        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(testIds, clientProjectName_,
-                  templateId);
-              if (newClientRuntimeId.length() > 0)
-              {
-                clientRuntimeId_ = newClientRuntimeId;
-                clientComponentType_ = templateId;
-                clientIds_.setRuntimeId(serviceIds.getRuntimeId());
-                clientIds_.setServerId(serviceIds.getServerId());
-                clientIds_.setServerInstanceId(serviceIds.getServerInstanceId());                
-                break outer;
-              }
-            }
-          }
-        }
-      }
-    } 
-    
-    //3. If step 2 was successful, clientRuntimeId_ should now be set, along with clientProjectName_,
-    //   clientComponentType_, and all the values in clientIds_. All that remains is setting the EAR.
-    if (clientRuntimeId_ != null && clientRuntimeId_.length()>0)
-    {
-      setDefaultClientEarProject();
-      //Update the client side EAR from the service side EAR if necessary.
-      if (serviceNeedEAR)
-      {
-        defaultClientEarFromServiceEar(serviceProjectName, serviceEarProjectName); 
-      }
-      return Status.OK_STATUS;
-    }
-    else
-    {
-      //Step 2 was not successful. Client side defaulting cannot be done using the service side server
-      //and web service runtime defaults. Return an error status.
-      return StatusUtils.errorStatus("");
-    }
-  }
-  
-  protected void defaultClientEarFromServiceEar(String serviceProjectName, String serviceEarProjectName)
-  {
-    //Client side
-    if (clientNeedEAR_)
-    {
-      IProject clientProject = ProjectUtilities.getProject(clientProjectName_);
-      if(clientProject==null || !clientProject.exists() 
-        || !(clientEarProjectName_.equalsIgnoreCase(serviceEarProjectName)))
-      {
-        ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();         
-        if (!ptc.isUseTwoEARs()) 
-        {
-          clientEarProjectName_ = serviceEarProjectName;
-        }
-        else 
-        {
-          IProject proxyEARProject = getUniqueClientEAR(clientEarProjectName_, serviceEarProjectName, clientProjectName_, serviceProjectName);
-          clientEarProjectName_ = proxyEARProject.getName();
-        }     
-      }
-    }
-    
-  }
-  
-  private IProject getUniqueClientEAR(String earProjectName, String serviceEARProject, String clientProjectName, String serviceProjectName) {
-
-    String projectName = new String();
-    //If the client project doesn't exist and the service project does, ensure the
-    //the client side EAR's J2EE level is such that the service project could be added to it.
-    //This will ensure we don't default the page with a client project EAR at a lower
-    //J2EE level than the service side.
-    boolean goodJ2EELevel = true;
-    if (!earProjectName.equalsIgnoreCase(serviceEARProject))
-    {
-      IProject clientProject = ProjectUtilities.getProject(clientProjectName);
-      IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
-      IProject earProject = ProjectUtilities.getProject(earProjectName);
-      if (!clientProject.exists() && serviceProject.exists())
-      {
-        boolean canAssociate = J2EEUtils.canAssociateProjectToEARWithoutWarning(serviceProject, earProject);
-        goodJ2EELevel = (canAssociate);
-      }
-    }
-    
-    if (!earProjectName.equalsIgnoreCase(serviceEARProject) && goodJ2EELevel) {
-      projectName = earProjectName;
-    }    
-    else {
-      projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT;
-      int i=1;      
-      while (projectName.equalsIgnoreCase(serviceEARProject)) {
-        projectName = projectName+i;
-        i++;
-      }
-    }
-    return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName);
-    
-  }
-  
-  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);
-    }
-  }
-  
-  // This is for the Ant scenario where the client project name can be set in the property file.
-  // If the user has set the ClientProjectName use it for defaulting purposes
-  public void setClientProjectName(String name)
-  {
-	  clientProjectName_ = name;
-  }
-
-  public void setClientInitialProject(IProject clientInitialProject)
-  {
-    clientInitialProject_ = clientInitialProject;
-  }
-  
-  /**
-   * @param initialInitialSelection_ The initialInitialSelection_ to set.
-   */
-  public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
-  {
-    initialProject_ = getProjectFromInitialSelection(initialInitialSelection);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-
-  /**
-   * @param parser_ The parser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser parser) {
-    parser_ = parser;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  
-  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_;
-    }        
-  }
-}
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 0053910..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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          
- * 20060221   122661 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060223   129020 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20060510   140868 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060524   141024 joan@ca.ibm.com - Joan Haggarty
- * 20060829   145449 makandre@ca.ibm.com - Andrew Mak, Web service client project type dropdown disabled after selecting client project
- * 20060829   180833 ericdp@ca.ibm.com - Eric D. Peters,  New Web Service wizard service settings dialog has unlabelled enabled text fields
- * 20080409   226047 kathy@ca.ibm.com - Kathy Chan
- * 20080428   224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- *******************************************************************************/
-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.j2ee.model.internal.validation.EARValidationMessageResourceHandler;
-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.common.DefaultingUtils;
-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 Composite parent_;
-  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 PWRS0016 for the service-side Web project combo box of the
-   * runtime selection Page
-   */
-  private String INFOPOP_PWRS_COMBO_PROJECT = "PWRS0016";
-
-  //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 = "PWRS0018";
-  
-  /* CONTEXT_ID PWRS0020 for the service project type combo box of the runtime selection Page */
-  private String INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE = "PWRS0020";    
-
-  //private Combo earModule_;
-
-  /*
-   * Default Constructor
-   */
-  public ProjectSelectionWidget() {
-  }
-
-  /*
-   * ProjectSelectionWidget @param isClient
-   */
-  public ProjectSelectionWidget(boolean isClient) {
-    this.isClient_ = isClient;
-  }
-    
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-	  
-    parent_ = parent;
-    UIUtils uiUtils = new UIUtils(pluginId_);
-
-    statusListener_ = statusListener;
-		
-    if (isClient_)
-	{
-	  moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-      projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_CLIENT_TYPE, INFOPOP_PWRS_COMBO_CLIENT_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER |SWT.READ_ONLY);      
-	  earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, ConsumptionUIMessages.LABEL_CLIENT_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-    }
-    else 
-	{      
-	  moduleProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-      projectType_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_TYPE, ConsumptionUIMessages.TOOLTIP_PWCR_COMBO_SERVICE_TYPE, INFOPOP_PWRS_COMBO_SERVICE_PROJECT_TYPE, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);      
-	  earProject_ = uiUtils.createCombo(parent, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT, INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-    }
-    
-    //Temporarily remove the listeners
-    
-    projectTypeListener_ = new ModifyListener()
-    {
-      public void modifyText(ModifyEvent evt) 
-      {
-        handleProjectTypeChanged();
-        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);
-    messageText_.setBackground(parent.getBackground());
-    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_ );  
-  }
-    
-  public String getProjectName()
-  {
-	return moduleProject_.getText();
-  }
-  
-  public void setProjectName( String name )
-  {
-	listenersOff();
-    moduleProject_.setText( name );
-    handleProjectChanged();
-    updateEARState();
-	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("");
-    
-    handleProjectTypeChanged();
-    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;
-    if (earProject_ != null)
-    {
-    	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();
-    updateEARState();
-    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 handleProjectTypeChanged()
-  {
-    updateEARState();    
-  }
-  
-  private void handleProjectChanged()
-  { 
-    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_.deselectAll();        
-      }
-      else
-      {
-        populateProjectTypeCombo();
-        projectType_.setEnabled(true);
-      }      
-    }
-  }
-  
-  private void populateProjectTypeCombo()
-  {
-    //Get the old value if there was one.
-    String oldTemplateId = getComponentType();
-    
-    String[] templates = null;
-    if (trsIds_ != 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
-        {
-          // Select the preferred client project type.
-          ProjectTopologyContext ptc = WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-          String[] preferredTemplateIds = null;
-          if (isClient_)
-          {
-            preferredTemplateIds = ptc.getClientTypes();
-          }
-          else
-          {
-            preferredTemplateIds = ptc.getServiceTypes();
-          }
-          
-          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);
-          }
-        }
-      }
-    }
-  }
-  
-
-  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 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();    
-    setEarProjectItems(); 
-    
-    String earName = DefaultingUtils.getDefaultEARProjectName(moduleProject_.getText());
-    earProject_.setText(earName);
-  }
-
-  private boolean projectNeedsEAR(String projectName)
-  {
-    //If the project is a simple Java project or the project type is 
-    //Java utility return false.
-    if (projectName != null && projectName.length()>0)
-    {
-      IProject project = ProjectUtilities.getProject(projectName);
-      if (project.exists())
-      {
-        if (FacetUtils.isJavaProject(project))
-        {
-          return false;
-        }
-      }
-    }
-
-    //Project didn't rule out the need for an EAR
-    //so check the proect type
-    String templateId = getComponentType();
-    if (templateId != null && templateId.length()>0)
-    {
-      if (FacetUtils.isUtilityTemplate(templateId))
-      {
-        return false;
-      }
-    }
-    
-        
-	//Project or project type didn't rule out the need for an EAR
-    //so check 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));
-      }
-      parent_.layout();  //force message area resize/wrap
-    }
-    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))
-        {
-          boolean associateStatus = J2EEUtils.canAssociateProjectToEARWithoutWarning(p, ep);
-          if (!associateStatus)
-          {
-              return StatusUtils.warningStatus( NLS.bind(EARValidationMessageResourceHandler.MESSAGE_INCOMPATIBLE_SPEC_WARNING_, new String[]{p.getName(), ep.getName(), } ) );
-                  
-          }
-        }
-      }
-    }
-    
-    return finalStatus;
-  }
-}
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 fc2ed41..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060608   145529 kathy@ca.ibm.com - Kathy Chan
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080610   224433 makandre@ca.ibm.com - Andrew Mak, Need better error message in sample JSP generation when Java proxy bean does not exist (cont.)
- *******************************************************************************/
-
-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.consumption.ui.ConsumptionUIMessages;
-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 boolean runTestClient;
-  private boolean canRunTestClient = true;
-  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);
-	TestInfo testInfo = getTestInfo();
-	
-	if (wscte.isCodeGenNeeded() && testInfo.getProxyBean() == null)
-        return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED);
-	
-	IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();		
-		
-	status = commandFactoryExecution(iwst.generate(testInfo),env, monitor );
-	if(status.getSeverity() == Status.ERROR){
-	  return status;	
-	}
-	
-	testInfo.setRunTestClient(runTestClient);
-	
-	if(canRunTestClient){
-		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 setRunTestClient(boolean runTestClient)
-  {
-    this.runTestClient = runTestClient;
-  }
-  
-  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;
-  }
-  
-  public void setCanRunTestClient(boolean canRunTestClient){
-	  this.canRunTestClient = canRunTestClient;
-  }
-  
-  /**
-   * @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 08638af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060727   144354 kathy@ca.ibm.com - Kathy Chan
- * 20070502   180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/**
- */
-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;  // This actually represent whether client test is requested
-  private boolean launchedTest = false;
-  private boolean canGenProxy;
-  
-  public ClientTestFragment( String id )
-  {
-    SequenceFragment clientTestRoot = new SequenceFragment();
-    Condition        condition      = new Condition()
-                                      {
-                                        public boolean evaluate()
-                                        {
-                                          return testService && genProxy;
-                                        }
-                                      };
-    setCondition( condition );
-    
-    
-    Condition jspCondition      = new Condition()
-    {
-      public boolean evaluate()
-      {
-        return canGenProxy;
-      }
-    };
-
-    SimpleFragment simpleJSPFragment = new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" );
-    BooleanFragment choiceJSPFragment = new BooleanFragment();
-    choiceJSPFragment.setTrueFragment(simpleJSPFragment);
-    choiceJSPFragment.setCondition(jspCondition);
-    clientTestRoot.add(choiceJSPFragment);
-    
-    clientTestRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( clientTestRoot );
-    
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    this.genProxy = genProxy;  
-  }
-  
-  public void setCanGenerateProxy( boolean canGenProxy )
-  {
-    this.canGenProxy = canGenProxy;  
-  }
-  
-  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 0098457..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060815   104870 makandre@ca.ibm.com - Andrew Mak, enable/disable test page controls base on settings in test facility extension
- * 20060815   153903 makandre@ca.ibm.com - Andrew Mak, Browse does not work in generate client test page
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506   227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080527   234192 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080616   237298 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080619   237797 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080723   241303 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080808   243602 rkklai@ca.ibm.com   - Raymond Lai, fix NPE when changing runtime (the server combo)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.Set;
-
-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.Path;
-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.consumption.common.FacetUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.LabelsAndIds;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-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.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.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.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.facets.FacetUtil;
-
-
-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 Combo runtimesCombo;
-  /*CONTEXT_ID PWSM0004 for the server type combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBOBOX_SERVER = "PWSM0004";
-  
-  private Combo serverInstanceTypeCombo_;
-  /*CONTEXT_ID PWSM0005 for the server instance combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBOBOX_SERVER_INSTANCE = "PWSM0005";
-
-  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 Text 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 Text 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;
-  private boolean isPopup = false;
-  private boolean isWebProject = false;
-  
-  private LabelsAndIds runtimes_;
-  private LabelsAndIds serverInstances_;
-  
-  private IPath webContentPath_;
-  private IResource webContent_;
-    
-  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 );
-    testTypeCombo_.addSelectionListener(
-    		new SelectionAdapter() {
-    			public void widgetSelected(SelectionEvent e) {
-    				handleTestFacilitySelection();
-    			}
-    		}
-    );    
-    
-    
-    
-    new Label( comboGroup_, SWT.NONE );
-    
-    projectCombo_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_JSP_PROJECT_NAME,
-    									ConsumptionUIMessages.TOOLTIP_PWSM_COMBO_PROJECT,
-                                          INFOPOP_PWSM_COMBO_PROJECT,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    new Label( comboGroup_, SWT.NONE );
-    
-    
-    earCombo_ = uiUtils.createText( comboGroup_, ConsumptionUIMessages.LABEL_EAR_PROJECTS,
-    								ConsumptionUIMessages.TOOLTIP_PWSM_EAR_PROJECT,
-                                     INFOPOP_PWSM_EAR_COMBO,
-                                     SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    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 );
-    
-    
-    new Label( comboGroup_, SWT.NONE );
-    
-    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 );
-    runTestCheckbox_.addSelectionListener( new SelectionAdapter() 
-    {
-        public void widgetSelected( SelectionEvent evt )
-        {
-          handleRunTestCheckBox();
-        }
-      });
-    
-    return this;
-  }
-  
-  private void handleRunTestCheckBox(){
-	  boolean enabled = runTestCheckbox_.getSelection();
-	  runtimesCombo.setEnabled(enabled);
-	  serverInstanceTypeCombo_.setEnabled(enabled);
-	  
-  }
-  
-  private void handleFolderText()
-  {
-	// webContentPath_ is set when jspFolderText_ is set for the first time.  Therefore,
-	// if webContentPath_ is still null, there is no need to touch jspFolderText_ yet.
-	  
-	if (webContentPath_ == null)
-		return;
-	  
-  	String folder = sampleFolderText_.getText();	
-    jspFolderText_.setText(webContentPath_.toString() + IPath.SEPARATOR + folder);
-  }
-  
-  private void handleSampleBrowse()
-  {
-    IPath      selectedPath       = null;
-    IResource  initialResource    = null;
-    
-    try
-    {
-      initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
-    }
-    catch( CoreException exc )
-    {  
-    }
-    
-    if( initialResource == null )initialResource = webContent_;
-    
-    IResource resource = DialogUtils.browseResources( comboGroup_.getShell(), 
-                                                      webContent_,
-                                                      initialResource, 
-                                                      folderFilter_ );
-    
-    if( resource != null )
-    {
-      selectedPath = resource.getFullPath();   
-    
-      int webModuleSegments = selectedPath.matchingFirstSegments(webContentPath_);
-      
-      if ( webModuleSegments < webContentPath_.segmentCount() )
-      {
-        sampleFolderText_.setText("");
-        handleFolderText();
-      }
-      else
-      {
-        sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
-        handleFolderText();
-      }
-    }
-  }
-  
-  private void handleTestButton()
-  {
-    boolean enabled = testCheckbox_.getSelection();
-    
-    testTypeCombo_.setEnabled( enabled );
-    
-    if (enabled && testFacilities_ != null) {
-    	handleTestFacilitySelection();
-    	return;
-    }    
-
-    sampleFolderText_.setEnabled( enabled );
-    methodsTree_.setEnabled( enabled );
-    if(canRunTestClient_)
-    	runTestCheckbox_.setEnabled( enabled );
-    selectAllMethodsButton_.setEnabled( enabled );
-    deselectAllMethodsButton_.setEnabled( enabled );
-    sampleFolderBrowseButton_.setEnabled( enabled );
-    
-  
-  
-  }
-  
-  private void handleTestFacilitySelection() {
-	  
-	  String clientTestID = getTestFacility().getSelection();
-	  	
-	  WebServiceTestExtension testExtension = 
-		  (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
-		  .getWebServiceExtensionsByName(clientTestID);
-	    
-      boolean hasCodeGen = testExtension.isCodeGenNeeded();
-      
-      // folder selection is only applicable for test facilities with codegen
-      sampleFolderText_.setEnabled( hasCodeGen );
-      sampleFolderBrowseButton_.setEnabled( hasCodeGen && webContent_ != null );
-      
-      boolean hasMethods = testExtension.areMethodsNeeded();
-      
-      // method selection is only applicable for test facilities with methods
-      methodsTree_.setEnabled( hasMethods );      
-      selectAllMethodsButton_.setEnabled( hasMethods );
-      deselectAllMethodsButton_.setEnabled( hasMethods );
-      
-      // run on server only applicable for test facilities that needs launching
-      if(canRunTestClient_)
-    	  runTestCheckbox_.setEnabled( testExtension.isServerNeeded() );
-  }
-  
-  private void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-  } 
-  
-  private void handleServerChange()
-  {
-	  int selection = runtimesCombo.getSelectionIndex();
-	  serverInstances_.clear();
-	  serverInstanceTypeCombo_.removeAll();
-	  IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
-	  for(int j =0; j<servers.length;j++){
-			String id = runtimes_.getId(selection);
-			if(id.equals(servers[j].getRuntime().getId())){
-				serverInstances_.add(servers[j].getId(), servers[j].getName());
-				serverInstanceTypeCombo_.add(servers[j].getName());
-			}
-	  }
-	  serverInstanceTypeCombo_.select(0);
-	 
-  }  
-  
-  // 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() );
-    handleTestFacilitySelection();
-  }
-  
-  public SelectionList getTestFacility()
-  {
-    testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return testFacilities_;
-  }
-  
-  public String getTestID()
-  {
-    return testTypeCombo_.getText();
-  }
-  
-  /**
-   * Given a project name which may be of the (obsolete) format "project/module",
-   * return only the project part of the name
-   * 
-   * @param project The project name.
-   * @return If the name has the format "project/module", returns only "project", 
-   * otherwise returns the name as is.
-   */
-  private String extractProjectName(String project) {
-	  
-	  int index = project.indexOf("/");
-	  
-	  if (index != -1)
-		  project = project.substring(0, index);
-	  
-	  return project;
-  }
-  
-  
-  public void initServersTypes() 
-  {
-	if(runtimes_  == null)
-		runtimes_ = new LabelsAndIds();
-	IServer[] servers = org.eclipse.wst.server.core.ServerCore.getServers();
-	IRuntime[] runtimes = org.eclipse.wst.server.core.ServerCore.getRuntimes();
-	IServerType[] serverTypes = ServerCore.getServerTypes();
-	
-	
-	
-	String projectName = projectCombo_.getText();
-	
-	Set projectFacets = FacetUtils.getFacetsForProject(projectName);
-	for(int i = 0;i<runtimes.length;i++){
-		boolean showServer = false;
-		
-		if(runtimes[i].isStub()){
-			for(int l =0; l<servers.length;l++){
-				if(servers[l].getRuntime() != null){
-					if(runtimes[i].getId().equals(servers[l].getRuntime().getId())){
-						showServer = true;
-					}
-				}
-			}
-		}
-		else showServer = true;
-		
-		if(showServer && canRunTestClient_){	
-			if(isWebProject){
-				org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = FacetUtil.getRuntime(runtimes[i]);
-				if(FacetUtils.doesRuntimeSupportFacets(runtime, projectFacets)){
-					runtimes_.add(runtimes[i].getId(), runtimes[i].getName());
-					runtimesCombo.add( runtimes[i].getName() );
-				}
-			}
-			else{
-				runtimes_.add(runtimes[i].getId(), runtimes[i].getName());
-				runtimesCombo.add( runtimes[i].getName() );	
-			}
-		}
-	}
-	
-	runtimesCombo.select(0);
-	if(serverInstances_  == null)
-		serverInstances_ = new LabelsAndIds();
-	
-	
-	String id = runtimes_.getId(0);
-	if(id != null){
-		for(int k =0; k<servers.length;k++){
-			if(servers[k].getRuntime() != null){
-				if(id.equals(servers[k].getRuntime().getId())&& canRunTestClient_){
-					serverInstances_.add(servers[k].getId(), servers[k].getName());
-					serverInstanceTypeCombo_.add(servers[k].getName());
-				}
-			}
-		}
-		serverInstanceTypeCombo_.select(0);
-	}
-		
-	serverInstanceTypeCombo_.setEnabled(canRunTestClient_ && runTestCheckbox_.getSelection());
-	runtimesCombo.setEnabled(canRunTestClient_ && runTestCheckbox_.getSelection());
-  }
-  
-  
-  
-  
-  public void setSampleProject(String clientProject) 
-  {
-	projectCombo_.setText(extractProjectName(clientProject));
-  }
-  
-  public void setSampleProjectEAR(String clientProjectEAR) 
-  {
-    earCombo_.setText(extractProjectName(clientProjectEAR));
-  }
-  
-  public String getFolder()
-  {
-    return sampleFolderText_.getText();
-  }
-  
-  public void setFolder( String folder )
-  {
-    sampleFolderText_.setText( folder );
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-  
-  public void setJspFolder( String folder )
-  {
-	webContentPath_ = (new Path(folder)).removeLastSegments(1);
-	webContent_ = ResourceUtils.findResource(webContentPath_);	
-	sampleFolderBrowseButton_.setEnabled(webContent_ != null);
-	  
-    jspFolderText_.setText( folder );
-  }
-  
-  public String getJspFolder()
-  {
-    return jspFolderText_.getText();
-  }
-  
-  public void setLaunchedServiceTestName (String launchedServiceTestName)
-  {
-  }
-  
-  public boolean getRunTestClient()
-  {
-    return runTestCheckbox_.getSelection();
-  }
-  
-  public void setRunTestClient( boolean value )
-  {
-	  runTestCheckbox_.setSelection( value );
-  }
-  
-  public void setIsWebProject( boolean value )
-  {
-	  isWebProject = value;
-  }
-  
-  private boolean canRunTestClient_;
-  
-  public void setCanRunTestClient(boolean canRunTestClient){
-	  canRunTestClient_ = canRunTestClient;
-	  if(!canRunTestClient_) {
-		  runTestCheckbox_.setSelection(false);
-		  runTestCheckbox_.setEnabled(false);
-	  }
-  }
-  
-  public void setPopup(boolean popup){
-	  isPopup = popup;
-	  if(isPopup){
-		  UIUtils      uiUtils  = new UIUtils( pluginId_ );
-		  runtimesCombo = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_SERVERS_LIST,
-					ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_SERVER,
-					INFOPOP_PWSM_COMBOBOX_SERVER,
-		              SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-		    	runtimesCombo.addSelectionListener(
-		    		new SelectionAdapter() {
-		    			public void widgetSelected(SelectionEvent e) {
-		    				handleServerChange();
-		    			}
-		    		}
-		    	);    
-		    
-		  new Label( comboGroup_, SWT.NONE );
-		
-	  
-		  serverInstanceTypeCombo_ = uiUtils.createCombo( comboGroup_, ConsumptionUIMessages.LABEL_SERVERS_INSTANCES,
-					ConsumptionUIMessages.TOOLTIP_PWSM_COMBOBOX_SERVER_INSTANCE,
-					INFOPOP_PWSM_COMBOBOX_SERVER_INSTANCE,
-		              SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-		    
-		  new Label( comboGroup_, SWT.NONE );
-		  initServersTypes();
-	  
-	  }
-  }
-  
-  public boolean getCanRunTestClient()
-  {
-	  return canRunTestClient_;
-  }
-  
-  public String getServerInstanceId(){
-	  int instanceLabel = serverInstanceTypeCombo_.getSelectionIndex();
-	  if(instanceLabel == -1) return null;
-	  return serverInstances_.getId(instanceLabel);
-  }
-  
-  
-  public String getExistingServerId(){
-	  int typeLabel = runtimesCombo.getSelectionIndex();
-	  if(typeLabel == -1) return null;
-	  return runtimes_.getId(typeLabel);
-  }
-  
-  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;
-  }
-  
-  public IStatus getStatus() {
-	  if(!canRunTestClient_)
-		  return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_SERVER_NOT_FOUND_WARNING);
-  
-	  return  Status.OK_STATUS;
-  }
-}
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 b87d272..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,137 +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
- * -------- -------- -----------------------------------------------------------
- * 20060912   157039 makandre@ca.ibm.com - Andrew Mak, new webserviceutils.jar not copied in client generation
- * 20061025   161250 makandre@ca.ibm.com - Andrew Mak, Installations or workspace paths with spaces break Sample Gen and Java Editor Launch
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-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;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-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);
-       URL sourceURL = BundleUtils.getURLFromBundle( WebServiceConsumptionPlugin.ID, source );       
-       if(resource != null) {    	      	   
-    	   File sourceFile = new File(FileLocator.toFileURL(sourceURL).getPath());   
-    	   if (resource.getLocation().toFile().length() == sourceFile.length())
-    		   return Status.OK_STATUS;
-       }
-       FileResourceUtils.createFile(context, 
-                      							target,
-                                    sourceURL.openStream(),
-                                    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/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 df42822..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080425   221232 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080527   234169 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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.consumption.command.common.CreateServerCommand;
-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();
-    }
-  	else if(sampleServerTypeID != null){
-  		CreateServerCommand createServer = new CreateServerCommand();
-  		createServer.setServerFactoryid(sampleServerTypeID);
-  		createServer.execute(monitor, adaptable);
-  		sampleServerInstanceId = createServer.getServerInstanceId();
-  		if(sampleServerInstanceId != null)
-  			sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
-  	
-  	}
-    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)
-  {
-	  sampleServerTypeID=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 94ca347..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 c9eb16f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060727   144354 kathy@ca.ibm.com - Kathy Chan
- * 20070502   180304 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-/*
- * 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;  // This actually represent whether client test is requested
-  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 setCanGenerateProxy(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 21f2f74..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 a246e7c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,135 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060727   144354 kathy@ca.ibm.com - Kathy Chan
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060907   156606 makandre@ca.ibm.com - Andrew Mak, no sample JSP in the pop-up action of Generate Sample JSPs
- *******************************************************************************/
-/*
- * 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 java.util.ArrayList;
-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.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 Style - Code Templates
- */
-public class TestDefaultingFragment extends AbstractDataModelOperation
-{
-  
-  private SelectionList testFacilities;
-  private String launchedServiceTestName;
-  private ScenarioContext scenarioContext;	
-  private boolean generateProxy;  // This actually represent whether client test is requested
-  
-  private String clientRuntimeId_;
-  
-  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();	  
-    List newTestTypes = new ArrayList();
-	String[] wsdlCases = scenarioContext.getNonJavaTestService();
-	boolean launched = false;
-	
-    for(int i = 0;i<testTypes.length;i++){
-    	
-      WebServiceTestExtension extension =
-    	  (WebServiceTestExtension) WebServiceTestRegistry.getInstance()
-    	  .getWebServiceExtensionsByName(testTypes[i]);
-		  
-      if (clientRuntimeId_ != null && !extension.supportsRuntime(clientRuntimeId_))
-    	  continue;
-    	
-	  if(testTypes[i].equals(launchedServiceTestName))
-	    launched = true;
-	  else{
-	     newTestTypes.add(testTypes[i]); 
-	  }
-	}
-	   	
-    if(launched)
-	  newTestTypes.add(launchedServiceTestName);
-    
-	
-	if(!generateProxy)
-      testFacilities = new SelectionList(wsdlCases,0);	
-	else {
-	  String[] tempArray = new String[newTestTypes.size()];
-	  testFacilities = new SelectionList((String[]) newTestTypes.toArray(tempArray), 0);
-	}
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-    
-  /**
-   * Sets the client runtime ID.
-   * 
-   * @param clientRuntimeId The client runtime ID.
-   */
-  public void setClientRuntimeId(String clientRuntimeId) {
-	  clientRuntimeId_ = clientRuntimeId;
-  }
-
-}
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 a4efaab..0000000
--- 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 74553e5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 646a72a..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 91639a1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060608   144500 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060818   153903 makandre@ca.ibm.com - Andrew Mak, Browse does not work in generate client test page
- * 20060906   154548 gilberta@ca.ibm.com - Gilbert Andrews, This fixes name collisions when creating a sample project
- * 20060922   158177 makandre@ca.ibm.com - Andrew Mak, NPE when creating web service client into existing Java project with test
- * 20080507   224433 makandre@ca.ibm.com - Andrew Mak, Need better error message in sample JSP generation when Java proxy bean does not exist
- *******************************************************************************/
-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.IPath;
-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.j2ee.internal.project.J2EEProjectUtilities;
-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();
-  	
-    if(proxyBean == null){
-        IStatusHandler sHandler = env.getStatusHandler();
-        IStatus errorStatus = StatusUtils.errorStatus( ConsumptionUIMessages.MSG_ERROR_JTS_PROXY_NOT_COMPILED );
-        sHandler.reportError(errorStatus);
-        return errorStatus;
-        
-    } 	
-    
-	IStatus status = Status.OK_STATUS;
-  	
-	sampleProjectAndEarSetup(env);
-	IPath webcontentPath = null;
-
-	// *need* to double-check that clientIProject is a web project
-	if (J2EEUtils.isWebComponent(clientIProject))
-		webcontentPath = J2EEUtils.getWebContentPath(clientIProject);
-	
-    //Get the sample Folder ready
-    StringBuffer sb = new StringBuffer();
-    
-    if (webcontentPath != null)
-    {	
-    	String path = webcontentPath.toString();
-    	sb.append(path).append("/");
-    }
-    else
-    {	//then just use the default
-    	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
-    */
-    
-    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;
-	  
-	  String sampleTemp = sampleP;
-	  
-	  boolean nameFound = false;
-	  int i = 1;
-	  while(!nameFound){
-		  IProject sampleIProject = (IProject)ProjectUtilities.getProject(sampleTemp);
-		  if(sampleIProject.exists() && !J2EEProjectUtilities.isDynamicWebProject(sampleIProject)){
-			  sampleTemp = sampleP + Integer.toString(i);
-			  sampleProject = sampleTemp + "/" + sampleC;
-		      
-		  }
-		  else
-			  nameFound = true; 
-		  
-		  i++;
-	  }
-	  sampleP = sampleTemp;
-    
-  	}  
-	
-  	
-  	
-  	
-  	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 fd945a7..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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 bee7b63..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,97 +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.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;
-  }
-}
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 8ad6eeb..0000000
--- 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 cfa116d..0000000
--- 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 dbfc9ae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 c604bf8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060324   122799 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060503   138478 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060510   141115 rsinha@ca.ibm.com - Rupam Kuehner
- * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080211   117924 trungha@ca.ibm.com - Trung Ha
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080527   234169 gilberta@ca.ibm.com - Gilbert Andrews
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-
-import org.eclipse.core.commands.ExecutionException;
-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.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-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.CreateFacetedProjectCommand;
-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.command.StartServerCommand;
-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.frameworks.datamodel.AbstractDataModelOperation;
-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;
-  
-  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();
-	  //1. Create a Web project for the sample if one does not already exist.
-	  sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  boolean createdSampleProject = false;
-      ValidationUtils vu = new ValidationUtils();
-      boolean serverNeedsEAR = vu.serverNeedsEAR(testInfo.getClientServerTypeID());
-      if (serverNeedsEAR) {
-		if (testInfo.getClientEARProject() == null
-				|| testInfo.getClientEARProject().length() == 0) {
-			sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
-		} else {
-			sampleEARProject = testInfo.getClientEARProject();
-		}
-      }
-      if (!sampleIProject.exists())
-      {    	
-          CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-          command.setProjectName(testInfo.getGenerationProject());
-          command.setTemplateId(IJ2EEModuleConstants.JST_WEB_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 Web project that the selected server supports.
-          command.setRequiredFacetVersions(new RequiredFacetVersion[0]);           
-          command.setServerFactoryId(testInfo.getClientServerTypeID());
-          command.setServerInstanceId(testInfo.getClientExistingServer().getId());
-          command.setEarProjectName(sampleEARProject);
-          IStatus status = command.execute( monitor, adaptable );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError( status );
-            return status;
-          }                    	  
-          createdSampleProject = true;
-      }
-	  
-	  //2. If the selected server requires an EAR and no EAR name
-	  //has been provided, choose an EAR name and create it if it doesn't exist.
-      if (serverNeedsEAR) {
-			sampleEARIProject  = ProjectUtilities.getProject(sampleEARProject);
-			if (sampleEARIProject == null || !sampleEARIProject.exists())
-			{
-		          CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-		          command.setProjectName(sampleEARProject);
-		          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 Web project that the selected server supports.
-		          command.setRequiredFacetVersions(new RequiredFacetVersion[0]);           
-		          command.setServerFactoryId(testInfo.getClientServerTypeID());
-		          command.setServerInstanceId(testInfo.getClientExistingServer().getId());
-		          IStatus status = command.execute( monitor, adaptable );
-		          if (status.getSeverity() == Status.ERROR)
-		          {
-		            env.getStatusHandler().reportError( status );
-		            return status;
-		          }                    	  				
-			}
-			
-	  }
- 
-	  // 3. If the selected server requires an EAR, and the sample project has
-		// not already been added to the EAR, add it.
-      if (serverNeedsEAR)
-      {
-  	    AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-	    associateCommand.setProject(testInfo.getGenerationProject());
-	    associateCommand.setEARProject(sampleEARProject);
-	    associateCommand.setEar(sampleEARProject);
-		associateCommand.setEnvironment( env );
-	    IStatus status = associateCommand.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }      	  
-      }
-	  
-
-      
-	  
-	  // 4. If server requires an EAR, and the sample EAR has not already been
-		// added to the server, add it.
-	  //   If no EAR is required, and sample project has not been added to the server add it.
-      if (serverNeedsEAR && testInfo.getClientExistingServer() != null)
-      {
-    	//Add sampleEARIProject to the server if needed.
-  		AddModuleToServerCommand modToServer = new AddModuleToServerCommand();
-		modToServer.setModule(sampleEARProject);
-		modToServer.setProject(sampleEARProject);
-		modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-		modToServer.setEnvironment( env );
-		IStatus status = modToServer.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }         	  
-      }
-      else
-      {
-    	  //add sampleIProject directly to the server if needed.
-    	  if(testInfo.getClientExistingServer()!= null){
-    		  AddModuleToServerCommand addToServer = new AddModuleToServerCommand();
-    		  addToServer.setModule(testInfo.getGenerationProject());
-    		  addToServer.setProject(testInfo.getGenerationProject());
-    		  addToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-    		  addToServer.setEnvironment( env );
-    		  IStatus status = addToServer.execute( monitor, null );
-    		  if (status.getSeverity()==Status.ERROR)
-    		  {
-    			  env.getStatusHandler().reportError(status);     
-    		  }                  	      	  
-    	  }  
-    }
-	  
-	  //5. Call StartServerCommand if this command had to create the sample project.
-      if (createdSampleProject)
-      {
-		StartServerCommand startServer = new StartServerCommand(true);
-		startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-		startServer.setEnvironment( env );
-		IStatus status = startServer.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }
-      }
-      
-      
-	  //6. Establish all necessary dependencies between client project, sample project, and EAR
-      
-	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-
-		if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) {
-			if (J2EEUtils.isJavaComponent(clientIProject)) {				
-				J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, monitor);
-				J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
-			}
-
-				try
-				{
-				  String uri = clientIProject.getName() + ".jar";
-				  J2EEUtils.addJAROrModuleDependency(sampleIProject, uri);
-				  
-				  // Adding the attribute to the referenced project's classpath entries of 'lib' kind
-				  // so that these libs will be bundled along with the project when exported
-				  IClasspathEntry[] classPath = JavaCore.create(clientIProject).getRawClasspath();
-				  for (int i = 0; i < classPath.length; i++) {
-					IClasspathEntry classpathEntry = classPath[i];
-					if ( classpathEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY ){
-						UpdateClasspathAttributeUtil.addDependencyAttribute(monitor, clientIProject.getName(), classpathEntry);
-					}
-				  }
-				  
-				} catch (CoreException ce)
-				{
-					String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{sampleIProject.getName(), clientIProject.getName()});
-					IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
-					env.getStatusHandler().reportError(errorStatus);
-				} catch (IOException ioe)
-				{
-					String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{sampleIProject.getName(), clientIProject.getName()});
-					IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
-					env.getStatusHandler().reportError(errorStatus);					
-				} catch (ExecutionException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}							
-			
-			
-		}      	  
-    
-    return Status.OK_STATUS;
-  }
-  
- 
-
-  
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
- 
-}
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 e7d91d9..0000000
--- 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 e364e68..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060418   134322 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424   124368 kathy@ca.ibm.com - Kathy Chan
- * 20090929	  250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-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.commands.ExecutionException;
-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.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildBeanCommand;
-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.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();    
-
-	IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	
-	BuildBeanCommand buildCommand = new BuildBeanCommand();
-	buildCommand.setEnvironment(env);
-	buildCommand.setProject(sampleProject);
-	try {
-		//ensure the sample project is built
-		buildCommand.execute(monitor, null);
-	} catch (ExecutionException e2) {
-		//just ignore and see if we can move on
-	}
-	 
-	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;
-	
-	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){
-			env.getLog().log(ILog.ERROR, 5048, this, "launchSample", exc);
-			status = StatusUtils.errorStatus(exc.getMessage(), exc);
-			env.getStatusHandler().reportError(status);
-	    	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;
-	    }
-     }
-}
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 ea06856..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
+++ /dev/null
@@ -1,41 +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
- * -------- -------- -----------------------------------------------------------
- * 20060608   145529 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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();
-	if (testInfo.getRunTestClient()) {
-		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/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 8f00dc3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 e3f9426..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 cd96e45..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060327   131605 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060717   150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726   150865 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060726   150867 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060728	  151723 mahutch@ca.ibm.com - Mark Hutchinson
- * 20060802   148731 mahutch@ca.ibm.com - Mark Hutchinson
- * 20071129	  206080 zina@ca.ibm.com	- Zina Mostafia Service Deployment Config Dialog group name truncated in NL Testing
- * 20071129	  205583 zina@ca.ibm.com	- Zina Mostafia Selected Server or Server Type is not highlighted in Service Dep.Config
- * 20080428   224726 pmoogk@ca.ibm.com - Peter Moogk
- * 20080527   234225 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-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.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.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.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-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 {
-
-	private Shell thisShell;
-	private Text messageBanner_;
-	private Composite primaryGroup_;
-	private Group runtimesGroup_;
-	private Group serversGroup_;
-	private Tree runtimesList_;
-	private Tree serverList_;
-	private Button viewSelectionByRuntimeButton_;
-	private Button viewSelectionByServerButton_;
-	private Button viewSelectionByExploreButton_;
-	private ILabelProvider labelProvider_;
-	private Image serverTypesIcon;
-	private Image existingServersIcon;
-
-	/*
-	 * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
-	 */
-	private String INFOPOP_PWRS_DIALOG = "PWRS0001";
-	/* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
-	private String INFOPOP_PWRS_LIST_RUNTIMES = "PWRS0002";
-	/* CONTEXT_ID PWRS0003 for the server selection in the dialog */
-	private String INFOPOP_PWRS_LIST_SERVERS = "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 = "PWRS0005";
-	/*
-	 * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
-	 */
-	private String INFOPOP_PWRS_RADIO_SERVER = "PWRS0006";
-	/*
-	 * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
-	 */
-	private String INFOPOP_PWRS_RADIO_EXPLORE = "PWRS0007";
-	private Hashtable<String, String> serverLabels_;
-	private Hashtable <String, IServer>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_;
-
-	private boolean selectServerFirst_ = false;
-
-	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<String,String>();
-		existingServersTable_ = new Hashtable<String, IServer>();
-		labelProvider_ = ServerUICore.getLabelProvider();
-	}
-
-	public void setSelectServerFirst(boolean selectServerFirst) {
-		selectServerFirst_ = selectServerFirst;
-	}
-
-	protected Point getInitialSize()
-	{
-		return this.getShell().computeSize(550, SWT.DEFAULT, true);
-	}
-
-	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);  
-		comp.pack(); 
-
-		if (selectServerFirst_) {
-			viewSelectionByServerButton_.setSelection(true);  
-			handleServerViewSelectionEvent();
-		}
-		else
-			viewSelectionByRuntimeButton_.setSelection(true);
-
-		return comp;
-	} 
-
-	protected void setShellStyle(int newShellStyle)
-	{
-		super.setShellStyle( newShellStyle | SWT.RESIZE );  
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		validateOn_ = false;
-		thisShell = parent.getShell();
-		if (thisShell == null) {
-			thisShell = createShell();
-		}
-		Composite composite = (Composite) super.createDialogArea(parent);
-
-		UIUtils uiUtils = new UIUtils(WebServiceConsumptionUIPlugin.ID);
-		// 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, WebServiceConsumptionUIPlugin.ID + "." + 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);
-
-		//  -----------------------------------------------------------------------//
-		new Label(composite, SWT.HORIZONTAL);
-		//  -----------------------------------------------------------------------//
-		// Selection
-		thisShell.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_PAGE);
-
-		String groupName =(selectionMode_ == MODE_SERVICE) ? ConsumptionUIMessages.LABEL_SELECTION_VIEW_TITLE:
-			ConsumptionUIMessages.LABEL_CLIENT_SELECTION_VIEW_TITLE;
-		Group viewSelectionGroup_ = uiUtils.createGroup(composite, groupName, null, null);
-
-		Composite viewSelectionComp_ = uiUtils.createComposite(viewSelectionGroup_, 1);
-		viewSelectionByServerButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_SERVER, 
-				ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_SERVER, INFOPOP_PWRS_RADIO_SERVER);
-		viewSelectionByServerButton_.addSelectionListener(new SelectionAdapter () {
-			public void widgetSelected(SelectionEvent e) {
-				if (!validateOn_)	      return;
-				enableOKButton();
-				handleServerViewSelectionEvent();
-			}	
-		});
-
-		viewSelectionByRuntimeButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_RUNTIME,
-				ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_RUNTIME, INFOPOP_PWRS_RADIO_RUNTIME);
-		viewSelectionByRuntimeButton_.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!validateOn_)	      return;
-				enableOKButton();
-				handleRuntimeViewSelectionEvent();
-			}
-		});
-
-		viewSelectionByExploreButton_ = uiUtils.createRadioButton(viewSelectionComp_, ConsumptionUIMessages.LABEL_SELECTION_VIEW_EXPLORE,
-				ConsumptionUIMessages.TOOLTIP_PWRS_RADIO_EXPLORE, INFOPOP_PWRS_RADIO_EXPLORE);
-		viewSelectionByExploreButton_.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!validateOn_)	      return;
-				enableOKButton();
-				handleExploreViewSelectionEvent();
-				super.widgetSelected(e);
-			}
-		});
-
-		primaryGroup_ = uiUtils.createComposite(composite, 1);
-		runtimesGroup_ = uiUtils.createGroup( primaryGroup_, ConsumptionUIMessages.LABEL_RUNTIMES_LIST, 
-				ConsumptionUIMessages.TOOLTIP_PWRS_LIST_RUNTIMES, INFOPOP_PWRS_LIST_RUNTIMES);
-		runtimesGroup_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-		runtimesList_ = uiUtils.createTree(runtimesGroup_, ConsumptionUIMessages.TOOLTIP_PWRS_LIST_RUNTIMES, 
-				INFOPOP_PWRS_LIST_RUNTIMES, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		runtimesList_.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!validateOn_)	      return;
-				enableOKButton();
-				TreeItem[] runtimeSel = runtimesList_.getSelection();
-				processRuntimeListSelection(runtimeSel[0].getText());
-				validateServerRuntimeSelection();
-			}
-		});
-
-		//  Server labels control
-		serversGroup_ = uiUtils.createGroup(primaryGroup_, ConsumptionUIMessages.LABEL_SERVERS_LIST, 
-				ConsumptionUIMessages.TOOLTIP_PWRS_LIST_SERVERS, null);
-		serversGroup_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-		serverList_ = uiUtils.createTree(serversGroup_, ConsumptionUIMessages.TOOLTIP_PWRS_LIST_SERVERS, INFOPOP_PWRS_LIST_SERVERS,
-				SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-		serverList_.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (!validateOn_)	      return;
-				enableOKButton();
-				processServerListSelection();
-				validateServerRuntimeSelection();
-			}	
-		});
-
-		ServersList serverList = new ServersList();
-		serverList.setServerTreeItems(serverList_);
-
-		setRuntimesGroup();
-		//  -----------------------------------------------------------------------//
-		new Label(composite, SWT.HORIZONTAL);
-		validateOn_ = true;
-		org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
-		return composite;
-	}
-
-
-	private void validateServerRuntimeSelection() {
-
-		if (selectionMode_ == MODE_SERVICE) {
-			if (selectedServerFactoryID_ != null && selectedRuntime_ != null) 
-			{
-
-				if (WebServiceRuntimeExtensionUtils2.isServerRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_.getId(),
-						typeId_))
-				{
-					setOKStatusMessage();
-				} else
-				{
-					String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
-					String runtimeLabel = selectedRuntime_.getLabel();
-					setERRORStatusMessage(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
-							runtimeLabel }));
-					// Found an error - so return.
-					return;
-				}
-			}
-		}
-		else {
-
-			if (selectedServerFactoryID_ != null && selectedRuntime_ != null)
-			{
-				String clientId = typeId_;
-				if (WebServiceRuntimeExtensionUtils2.isServerClientRuntimeTypeSupported(selectedServerFactoryID_, selectedRuntime_
-						.getId(), clientId))
-				{
-					setOKStatusMessage();
-				} else
-				{
-					String serverLabel = WebServiceRuntimeExtensionUtils2.getServerLabelById(selectedServerFactoryID_);
-					String runtimeLabel = selectedRuntime_.getLabel();
-					setERRORStatusMessage(NLS.bind(ConsumptionUIMessages.MSG_INVALID_SRT_SELECTIONS, new String[] { serverLabel,
-							runtimeLabel }));
-					// Found an error - so return.
-					return;
-				}
-			}
-		}
-		// 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);
-		messageBanner_.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_BLACK));
-		enableOKButton();
-	}
-
-	private void setERRORStatusMessage(String message) {
-		messageBanner_.setText(message);
-		messageBanner_.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_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() {
-		if (labelProvider_!=null)
-			labelProvider_.dispose();
-		if (existingServersIcon!=null)
-			existingServersIcon.dispose();
-		if (serverTypesIcon!=null)
-			serverTypesIcon.dispose();
-		setReturnCode(OK);
-		close();
-	}
-
-	protected void cancelPressed() {
-		if (labelProvider_!=null)
-			labelProvider_.dispose();
-		if (existingServersIcon!=null)
-			existingServersIcon.dispose();
-		if (serverTypesIcon!=null)
-			serverTypesIcon.dispose();	
-		setReturnCode(CANCEL);
-		close();
-	}
-
-	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);
-		runtimesGroup_.moveAbove(serversGroup_);
-		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);
-		serversGroup_.moveAbove(runtimesGroup_);
-		primaryGroup_.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);
-		runtimesGroup_.moveAbove(serversGroup_);
-		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.getRuntimesByClientType(typeId_);
-		}
-
-		//sort the runtimes based on the runtime name (bug 151723)
-		Comparator<String> comparator = new RuntimeNameComparator();
-		Arrays.sort(runtimes, comparator);
-
-		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 class RuntimeNameComparator implements Comparator <String>
-	{
-		public RuntimeNameComparator()
-		{		
-		}
-		//Compare to runtime ID strings by their labels.  Used for sorting.
-		public int compare(String item1, String item2) {
-			try {
-				String runtime1 = (String)item1;
-				String runtime2 = (String)item2;		
-
-				return getRuntimeLabel(runtime1).compareToIgnoreCase(getRuntimeLabel(runtime2));
-			}
-			catch (Exception e)
-			{ //Just in case of class cast exception or NPE.  should never happen
-			}		
-			return 0;
-		}
-	}
-
-	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) {
-				existingServersIcon = id.createImage();
-				existingServersTree[0].setImage(existingServersIcon);
-			}
-			for (int k = 0; k < serverIds.length; k++) {
-			  IServer server = (IServer) existingServersTable_.get(serverIds[k]);
-			  if (server != null) {
-				  IServerType serverType = server.getServerType();
-				if (serverType != null) {
-					String serverID = serverType.getId();
-					existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
-					existingServerItems[k].setText(serverIds[k]);
-					if (serverID.equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
-						existingServersTree[0].setExpanded(true);
-						serverList.setSelection(new TreeItem[] { existingServerItems[k]});
-						existingServer = true;
-						RuntimeServerSelectionDialog.this.setIsExistingServer(true);
-						selectedServer_ = server;
-						selectedServerLabel_ = serverIds[k];
-						selectedServerFactoryID_ = serverID;
-					}
-					existingServerItems[k].setImage(labelProvider_.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) {
-				serverTypesIcon = id.createImage();
-				serverTypesTree[0].setImage(serverTypesIcon);
-			}
-			Hashtable <IServerType, IRuntimeType> categories_ = new Hashtable<IServerType, IRuntimeType>();
-			Hashtable <IRuntimeType, TreeItem>categoryTreeItem = new Hashtable<IRuntimeType, TreeItem>();
-			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 = labelProvider_.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 = labelProvider_.getImage(serverType);
-							item[i] = new TreeItem(parent[i], SWT.NONE);
-							item[i].setText(factoryText);
-							item[i].setImage(factoryImage);
-							item[i].setData(serverType);
-							if (serverIds[i].equals(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<String> serverIds = new Vector<String>();
-			{
-				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<String>serverTypes_ = new Vector<String>();
-			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/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 c015190..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter2.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060606   105045 mahutch@ca.ibm.com - Mark Hutchinson          
- * 20070328   172339 kathy@ca.ibm.com - Kathy Chan
- * 20080501   229728 makandre@ca.ibm.com - Andrew Mak, uppercase .WSDL cannot be found by the Web Service Client wizard
- * 20080523   233764 makandre@ca.ibm.com - Andrew Mak, Top down EJB preference not respected
- *******************************************************************************/
-
-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.jdt.core.IType;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-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);
-                }
-              }
-              
-            }
-          }
-          
-          //TODO: Bug 179751 - Need to make checking for types recognized as bottom-up to be more extensible         
-          
-          if (supportedTypes.isEmpty()) {
-        	  if (initialObject instanceof BeanLink || initialObject instanceof ServiceImplBean || initialObject instanceof IType) {
-        		  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 if (initialObject instanceof String)
-              { //the initialObject could be a path name that is a string
-                //bug 105045
-            	name = (String)initialObject;
-              }
-              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("/");
-                
-                supportedTypes.add(entrybuff.toString() + "org.eclipse.jst.ws.wsImpl.java");
-                supportedTypes.add(entrybuff.toString() + "org.eclipse.jst.ws.wsImpl.ejb");
-              }
-            }
-            
-          }
-        }      
-      }
-      
-    }    
-  
-
-    
-    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.toLowerCase().endsWith(extensions[i].toLowerCase()))
-          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 8275acc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,84 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import com.ibm.icu.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 64bc552..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated 
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/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 b93efbb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 c72f4fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 86267d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 e4d9e65..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public String getName();
-    public String getInquiryURL();
-    public String getPublishURL();
-    public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index 93bacf1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 ea57878..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 7a177c5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
-  private Vector args_;
-
-  public Arguments()
-  {
-    args_ = new Vector();
-  }
-
-  public void add(String key, Object value)
-  {
-    args_.add(key);
-    if (value != null)
-      args_.add(value);
-  }
-
-  public void remove(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-    {
-      args_.remove(index);
-      args_.remove(index+1);
-    }
-  }
-
-  public Object get(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-      return args_.get(index+1);
-    else
-      return null;
-  }
-
-  public void clear()
-  {
-    args_.clear();
-  }
-
-  public Object[] getArguments()
-  {
-    Object[] args = new Object[args_.size()];
-    args_.copyInto(args);
-    return args;
-  }
-
-  public String[] getStringArguments()
-  {
-    String[] args = new String[args_.size()];
-    for (int i = 0; i < args.length; i++)
-      args[i] = args_.get(i).toString();
-    return args;
-  }
-
-  public boolean isEmpty()
-  {
-    return args_.isEmpty();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index 100750c..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 38a45fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 f2b49ee..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 4ab0915..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientRuntimeDescriptor.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071107 203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130 203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-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;
-  private IWebServiceRuntimeChecker webServiceRuntimeChecker;
-  private String runtimePreferredServerType;
-  
-  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;
-  }
-  
-  public IWebServiceRuntimeChecker getClientRuntimeChecker()
-  {
-    if (webServiceRuntimeChecker == null)
-    {
-        try
-        {
-        	if (elem.getAttribute("runtimeChecker") != null ) {
-        		webServiceRuntimeChecker = (IWebServiceRuntimeChecker)elem.createExecutableExtension("runtimeChecker");
-        	}
-        }
-        catch(CoreException ce)
-        {
-            
-        }
-    }
-    
-    return webServiceRuntimeChecker;
-  } 
-  
-  public String getRuntimePreferredServerType()
-  {
-    if (runtimePreferredServerType == null)
-    {
-    	runtimePreferredServerType = elem.getAttribute("runtimePreferredServerType");
-    }
-    return runtimePreferredServerType;
-  }
-}
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 e3c4b51..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,120 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import com.ibm.icu.util.StringTokenizer;
-
-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 034a6e8..0000000
--- 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 3243101..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/FacetMatchCache.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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)
- * 20060426   138051 kathy@ca.ibm.com - Kathy Chan
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080923   247525 mahutch@ca.ibm.com - Mark Hutchinson, cache not updated properly when project facet versions changed
- *******************************************************************************/
-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;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * FacetMatchCache caches results of calculations made respecting
- * the suitability of projects and project types for serviceRuntimes
- * and clientRuntimes.
- * 
- * <br/><br/>
- * Terminology used in the javadoc in this class:
- * <ul>
- * <li><b>serviceRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor</li>
- * <li><b>clientRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor</li>
- * </ul>
- *
- */
-public class FacetMatchCache implements IResourceChangeListener
-{
-  //single instance per workbench
-  private static FacetMatchCache instance_;
-  
-  
-  //Tables related to existing projects in the workspace
-  
-  //serviceFacetMatchTable_: 
-  //key: Object of type String.
-  //     Forward slash separated concatenation of a serviceRuntimeId and a projectName 
-  //     (e.g. org.eclipse.jst.ws.axis.creation.java/wp).
-  //value: Object of type org.eclipse.jst.ws.internal.consumption.common.FacetMatcher.
-  //       The FacetMatcher contains the matching characteristics calculated for the 
-  //       serviceRuntime and project in the key.
-  private Hashtable serviceFacetMatchTable_;
-  
-  //serviceTableKeysByProjectName_: 
-  //key: Object of type String.
-  //     project name (e.g. wp)
-  //value: Set of elements of type String. The Strings in the Set are keys from the serviceFacetMatchTable_ 
-  //       that contain the project name (e.g. org.eclipse.jst.ws.axis.creation.java/wp). Used to rapidly
-  //       delete entries from serviceFacetMatchTable_ after a project is deleted from the workspace.
-  private Hashtable serviceTableKeysByProjectName_;
-  
-  //clientFacetMatchTable_;
-  //key: Object of type String.
-  //     forward slash separated concatenation of a clientRuntimeId and a projectName 
-  //     (e.g. org.eclipse.jst.ws.axis.consumption.java/wp)
-  //value: Object of type org.eclipse.jst.ws.internal.consumption.common.FacetMatcher
-  //       The FacetMatcher contains the matching characteristics calculated for the 
-  //       clientRuntime and project in the key.
-  private Hashtable clientFacetMatchTable_;
-  
-  //clientTableKeysByProjectName_
-  //key: Object of type String.
-  //     project name (e.g. wp)
-  //value: Set of elements of type String. The Strings in the Set are keys from the clientFacetMatchTable_ 
-  //       that contain the project name (e.g. org.eclipse.jst.ws.axis.consumption.java/wp). Used to rapidly
-  //       delete entries from clientFacetMatchTable_ after a project is deleted from the workspace.
-  private Hashtable clientTableKeysByProjectName_;
-  
-  //projectEntriesToDelete_: elements of type String containing the names of projects that have
-  //been deleted from the workspace but their corresponding entries from serviceFacetMatchTable_ 
-  //and clientFacetMatchTable_ have yet to be deleted.
-  private List projectEntriesToDelete_;
-    
-  
-  
-  //Tables related to templates  
-  
-  //templatesByServiceRuntimeId_:
-  //key: Object of type String.
-  //     serviceRuntime id
-  //value: Set of elements of type org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate   
-  //       This the set of templates that support the serviceRuntime identified by the key.
-  private Hashtable templatesByServiceRuntimeId_;
-  
-  //templatesByClientRuntimeId_
-  //key: Object of type String.
-  //     clientRuntime id
-  //value: Set of elements of type org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate
-  //       This the set of templates that support the clientRuntime identified by the key.
-  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();
-    
-    //Listen for deletions of projects in order to delete all entries in
-    //Hashtables for the deleted project.
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE);
-  }
-  
-
-  /*
-   * Returns the FacetMatcher resulting from matching a serviceRuntime or clientRuntime with an existing project.
-   * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
-   * @param runtimeId the id of a clientRuntime if isClient is true or the id of a serviceRuntime if
-   * isClient is false.
-   * @param projectName the name of an existing project.
-   * 
-   * @returns FacetMatcher resulting from calling FacetUtils.match(..) using the serviceRuntime or clientRuntime id
-   * and the project name. Returns 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 which are a special case 
-   * - see FacetUtils.getFacetsForProject()).
-   */
-  public synchronized FacetMatcher getMatchForProject(boolean isClient, String runtimeId, String projectName)
-  {    
-    //Delete entries from tables 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;    
-  }
-  
-  /**
-   * Updates serviceTableKeysByProjectName_ or clientTableKeysByProjectName_ with
-   * the provided project name and key. This is called whenever a new entry is 
-   * added to serviceFacetMatchTable_ or clientFacetMatchTable_.
-   * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
-   * @param key 
-   * @param projectName
-   */
-  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);      
-    }
-  }
-  
-  /**
-   * Returns the {@link FacetMatcher} calculated for the given serviceRuntime or clientRuntime and project
-   * @param isClient true if runtimeId is a clientRuntimeId. false if runtimeId is a serviceRuntimeId.
-   * @param runtimeId the id of a clientRuntime if isClient is true or the id of a serviceRuntime if
-   * isClient is false.
-   * @param projectName the name of an existing project.
-   * @return FacetMatcher resulting from calling FacetUtils.match(..) using the serviceRuntime or clientRuntime id
-   * and the project name. Returns 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 which are a special case 
-   * - see FacetUtils.getFacetsForProject()).
-   */
-  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 = new HashSet(FacetUtils.getFacetsForProject(projectName));
-    if (facetVersions == null)
-    {
-      fm = new FacetMatcher();
-      fm.setMatch(false);
-      return fm;
-    }    
-    
-    fm = FacetUtils.match(rfvs, facetVersions);
-    
-    // Check if the facet runtime required by the required facet is supported
-    // by the project without chaning it's current facet runtime
-    
-    IRuntime fProjectRuntime = FacetUtils.getFacetRuntimeForProject(projectName);
-    if (fProjectRuntime != null) {
-    	String fProjectRuntimeName = fProjectRuntime.getName();
-    	boolean projectSupportRequiredFacetRuntime = false;
-    	Set rts = FacetUtils.getRuntimes(rfvs);
-    	for (Iterator iterator = rts.iterator(); iterator.hasNext() && !projectSupportRequiredFacetRuntime;) {
-    		IRuntime fRequiredRuntime = (IRuntime) iterator.next();
-    		if (fRequiredRuntime != null) {
-    			if (fRequiredRuntime.getName().equals(fProjectRuntimeName)) {
-    				projectSupportRequiredFacetRuntime = true;
-    			}
-    		}
-    	}
-
-    	// if project does not support the required facet runtime, set FacetMatch match to false
-    	if (!projectSupportRequiredFacetRuntime) {
-    		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();    
-  }  
-  
-  /**
-   * Removes all table entries in this cache for the given project
-   * @param isClient true to remove entries from client side tables. false to remove entries from service side tables
-   * @param projectName
-   */
-  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 the given clientRuntime
-   * @param clientRuntimeId id of a clientRuntime
-   * @returns Set (elementtype: 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;
-    }
-  }
-  
-  /**
-   * Returns a set of templates supported by the given serviceRuntime
-   * @param serviceRuntimeId id of a serviceRuntime
-   * @returns Set (elementtype: IFacetedProjectTemplate)
-   */  
-  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;
-    }
-  }
- 
-  
-  /**
-   * Returns the set of templates that supported the given required facet versions.
-   * @param requiredFacetVersions
-   * @return Set containing elemets of type {@link IFacetedProjectTemplate}.
-   */
-  private Set getTemplates(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    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. Next time getMatchForProject is called all
-        //entries for this project from all tables in this cache 
-        //will be deleted.
-        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 ac2bb37..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/RuntimeDescriptor.java
+++ /dev/null
@@ -1,74 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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;
-  private String serverRequiredString;
-  private boolean serverRequired;
-  
-
-  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"};
-  }
-  
-  public boolean getServerRequired()
-  {
-    if (serverRequiredString == null)
-    {     
-      //Defaults to true if the extension omits this attribute
-      serverRequired = true;
-
-      serverRequiredString = elem.getAttribute("serverRequired");
-      if (serverRequiredString != null)
-      {
-        serverRequired = Boolean.valueOf(serverRequiredString).booleanValue();
-      }             
-      
-    }    
-    return serverRequired;    
-  }
-  
-}
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 631454b..0000000
--- 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 092e7cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceRuntimeDescriptor.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060802   152150 mahutch@ca.ibm.com
- * 20071107   203826 kathy@ca.ibm.com - Kathy Chan
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080626   221364 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-
-
-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;
-  private IWebServiceRuntimeChecker webServiceRuntimeChecker;
-  private String runtimePreferredServerType;
-  
-  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++)
-      {
-    	try {
-    	  String facetID = facetElems[i].getAttribute("facet");
-    	  if (ProjectFacetsManager.isProjectFacetDefined(facetID))
-    	  {
-	        RequiredFacetVersion rfv = new RequiredFacetVersion();
-	        IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(facetID);
-	        if (projectFacet != null) {
-	        	IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(facetElems[i].getAttribute("version"));
-	        	if (projectFacetVersion != null) {
-	        		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);
-	        	}
-	        }
-    	
-    	  } 
-        } catch (IllegalArgumentException e){
-        	// ignore the facet
-  	    }
-      }
-      
-      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;
-  }  
-  
-  public IWebServiceRuntimeChecker getServiceRuntimeChecker()
-  {
-    if (webServiceRuntimeChecker == null)
-    {
-        try
-        {
-        	if (elem.getAttribute("runtimeChecker") != null ) {
-        		webServiceRuntimeChecker = (IWebServiceRuntimeChecker)elem.createExecutableExtension("runtimeChecker");
-        	}
-        }
-        catch(CoreException ce)
-        {
-            
-        }
-    }
-    
-    return webServiceRuntimeChecker;
-  } 
-  
-  public String getRuntimePreferredServerType()
-  {
-    if (runtimePreferredServerType == null)
-    {
-    	runtimePreferredServerType = elem.getAttribute("runtimePreferredServerType");
-    }
-    return runtimePreferredServerType;
-  }
-}
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 417cc29..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,201 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-import com.ibm.icu.util.StringTokenizer;
-
-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 d187b3a..0000000
--- 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 6caf1ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebServiceImpl {
-	
-  private IConfigurationElement elem_;
-	private String id;
-	private String label;
-	private String[] resourceTypeMetadata;
-	private String[] extensionMetadata;
-	private String objectSelectionWidget;
-	private IMerger mergerClass;
-  
-  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;
-  }
-  
-public IMerger getMergerClass() {
-	if (mergerClass == null)
-    {
-        try
-        {
-            mergerClass = (IMerger) elem_.createExecutableExtension("mergerClass");
-        }
-        catch(CoreException ce)
-        {
-            
-        }
-    }	
-	return mergerClass;
-}
-  
-
-
-}
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 ec58dee..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 ab2df35..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry2.java
+++ /dev/null
@@ -1,225 +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
- * -------- -------- -----------------------------------------------------------
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-
-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_;
-
-  //webServiceImpls_: 
-  //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.wsImpl
-  //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl 
-  Hashtable webServiceImpls_;
-
-  //webServiceClientImpls_: 
-  //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.wsClientImpl
-  //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceClientImpl  
-  Hashtable webServiceClientImpls_;
-
-  //runtimes_: 
-  //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.runtimes
-  //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor
-  Hashtable runtimes_;
-  
-  //serviceRuntimes_: 
-  //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes
-  //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor
-  Hashtable serviceRuntimes_;
-  
-  //clientRuntimes_: 
-  //key: id attribute of extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes
-  //value: org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor  
-  Hashtable clientRuntimes_;
-  
-  //webServiceTypesList_ contains a list of String values in this form: "scenario/webServiceImplId",
-  //where sceanrio the String representation of one of 
-  //org.eclipse.wst.ws.internal.wsrt.WebServiceScenario.BOTTOM_UP or 
-  //org.eclipse.wst.ws.internal.wsrt.WebServiceScenario.TOP_DOWN
-  //and webServiceImplId is the id attribute of an extension to org.eclipse.jst.ws.consumption.ui.wsImpl
-  //This list is used to determine the items displayed in the WebServiceType combo-box of page 1 of the 
-  //Web serivce wizard.
-  ArrayList webServiceTypesList_;
-  
-  //TODO: Not used. Remove this and all references to it in this class.
-  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 by reading all extensions to org.eclipse.jst.ws.consumption.ui.wsImpl
-    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 by reading all extensions to org.eclipse.jst.ws.consumption.ui.wsClientImpl
-    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 by reading all extensions to org.eclipse.jst.ws.consumption.ui.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 by reading all extensions to org.eclipse.jst.ws.consumption.ui.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 clientRuntimes by reading all extensions to org.eclipse.jst.ws.consumption.ui.clientRuntimes
-    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);
-          
-      }        
-    }
-  }  
-    
-  /**
-   * Updates the list of Web service types with the provided service runtime's contribution of
-   * scenario/webServiceImpl combination.
-   * @param descriptor
-   */
-  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/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 d634ef5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils2.java
+++ /dev/null
@@ -1,2216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060324   116750 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070119   159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 20071107   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402   225378 makandre@ca.ibm.com - Andrew Mak, Client wizard runtime/server defaulting is not respecting the preference
- * 20080530   234871 makandre@ca.ibm.com - Andrew Mak, Workbench has not been created yet error in cmdline Ant
- * 20080808   243623 mahutch@ca.ibm.com - Mark Hutchinson, Improve server defaulting performance
- *******************************************************************************/
-
-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.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.wizard.TypeSelectionFilter2;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.PlatformUI;
-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.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;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * This class contains numerous utility methods that
- * process the information provided through extension points
- * which are read in WebServiceRuntimeExtensionRegistry2:
- * <ul>
- * <li> org.eclipse.jst.ws.consumption.ui.wsImpl </li>
- * <li> org.eclipse.jst.ws.consumption.ui.wsClientImpl </li>
- * <li> org.eclipse.jst.ws.consumption.ui.runtimes </li>
- * <li> org.eclipse.jst.ws.consumption.ui.serviceRuntimes </li>
- * <li> org.eclipse.jst.ws.consumption.ui.clientRuntimes </li>
- * </ul>
- * 
- * to provide answers to common questions regarding which servers,
- * projects, and project types a particular Web service runtime
- * supports.
- * <br/><br/>
- * Teminology used in the javadoc in this class:
- * <ul>
- * <li><b>Web service scenario</b>: One of WebServiceScenario.BOTTOM_UP or WebServiceScenario.TOP_DOWN.</li> 
- * <li><b>Web service implementation type</b>: extension to org.eclipse.jst.ws.consumption.ui.wsImpl.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl.</li>
- * <li><b>Web service type</b>: Forward slash separated concatenation of the String representation
- * of a Web service scenario and a Web service implementation type id.
- * For example, "0/org.eclipse.jst.ws.wsImpl.java", represents the bottom up Java bean Web service type.</li>
- * <li><b>Web service client implementation type</b>: extension to org.eclipse.jst.ws.consumption.ui.wsClientImpl.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceClientImpl.</li>
- * <li><b>Web service runtime</b>: extension to org.eclipse.jst.ws.consumption.ui.runtimes. 
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.RuntimeDescriptor</li> 
- * <li><b>serviceRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.serviceRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor</li>
- * <li><b>clientRuntime</b>: extension to org.eclipse.jst.ws.consumption.ui.clientRuntimes.
- * The Java representation of this is org.eclipse.jst.ws.internal.consumption.ui.wsrt.ClientRuntimeDescriptor</li>
- * <li><b>server type</b>: This is a server tools artifact. You see a list of these when creating a new server
- * in the tool.</li>
- * <li><b>server runtime</b>: This is a server tools artifact. You see a list of these if you go to Preferences, 
- * Server > Installed Runtimes in the tool. The Java representation of this is org.eclipse.wst.server.core.IRuntime</li>
- * <li><b>facet runtime</b>: The facet equivalent of a server runtime. The Java representation of this is 
- * org.eclipse.wst.common.project.facet.core.runtime.IRuntime. org.eclipse.jst.server.core.FacetUtil
- * provides methods to translate from a server runtime to a facet runtime and vice-versa.</li>
- * </ul>
- */
-public class WebServiceRuntimeExtensionUtils2
-{
-  private static WebServiceRuntimeExtensionRegistry2 registry = WebServiceRuntimeExtensionRegistry2.getInstance();
-  
-  /**
-   * Returns the RuntimeDescriptor representing the Web service runtime
-   * with an id attribute equal to the provided id
-   * @param id
-   * @return RuntimeDescriptor representing the Web service runtime
-   * with an id attribute equal to the provided id. Returns null
-   * if such a RuntimeDescriptor cannot be found.
-   */  
-  public static RuntimeDescriptor getRuntimeById(String id)
-  {
-    Object result = registry.runtimes_.get(id);
-    if (result!=null)
-    {
-      return (RuntimeDescriptor)result;
-    }
-    return null;        
-  }
-  
-  /**
-   * Returns the union of all project types supported by all serviceRuntimes. Used by the
-   * ProjectTopology preference page. 
-   * @return String[] array of template ids. The array may have 0 elements.
-   */
-  public static String[] getAllServiceProjectTypes()
-  {
-    ArrayList finalTemplateIdList = new ArrayList();
-    Iterator iter = registry.serviceRuntimes_.values().iterator();
-
-    //Loop through all the serviceRuntimes
-    while (iter.hasNext())   
-    {
-      ServiceRuntimeDescriptor desc = (ServiceRuntimeDescriptor)iter.next();
-      
-      //Get the templates for this serviceRuntime
-      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 (!finalTemplateIdList.contains(template.getId()))
-        {
-          finalTemplateIdList.add(template.getId());
-        }
-      }            
-    }
-    
-    return (String[])finalTemplateIdList.toArray(new String[]{});
-  }
-  
-  /**
-   * Returns the union of all project types supported by all clientRuntimes. Used by the
-   * ProjectTopology preference page. 
-   * @return String[] array of template ids. The array may have 0 elements.
-   */
-  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 clientRuntime
-      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[]{});
-  }
-  
-  /**
-   * Returns the label of a Web service runtime given its id
-   * @param runtimeId id of a Web service runtime
-   * @return String the label of the Web service runtime with an id equal to runtimeId.
-   * Returns null if such a Web service runtime cannot be found.
-   */
-  public static String getRuntimeLabelById(String runtimeId) 
-  {
-    RuntimeDescriptor desc = getRuntimeById(runtimeId);
-    if (desc == null)
-      return null;
-    
-    return desc.getLabel();
-  }    
-  
-  /**
-   * Returns the RuntimeDescriptor corresponding to the Web service runtime with the provided label
-   * @param label label of a Web service runtime
-   * @return RuntimeDescriptor corresponding to the Web service runtime with the provided label
-   * Returns null if such a Web service runtime cannot be found.
-   */
-  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;      
-  }      
-
-  /**
-   * Returns the label of an server type given its id
-   * @param serverFactoryId id of a server type
-   * @return String label of the server type with an id equal to serverFactoryId.
-   * Returns null if such a server type cannot be found.
-   */
-  public static String getServerLabelById(String serverFactoryId)
-  {
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType == null)
-      return null;
-    
-    if (PlatformUI.isWorkbenchRunning()) {
-      String serverLabel = ServerUICore.getLabelProvider().getText(serverType);   
-      return serverLabel;
-    }
-    else
-      return serverType.getName();
-  }
-  
-  /**
-   * Returns the label of an IServer given its id
-   * @param instanceId id of an IServer
-   * @return String label of the IServer with an id equal to instanceId.
-   */  
-  public static String getServerInstanceLabelFromInstanceId( String instanceId )
-  {
-    IServer server = ServerCore.findServer( instanceId );    
-    return server.getName();
-  }  
-
-  /**
-   * Returns the union of all server type ids corresponding to the facet runtimes
-   * in the provided set.
-   * @param facetRuntimes a set containing elements of type {@link IRuntime}.
-   * @return an array of IServerType ids. The array may have 0 elements.
-   */
-  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]);
-        IRuntimeType runtimeType = serverType.getRuntimeType();
-        if (runtimeType != null)
-        {
-	        String runtimeTypeId = runtimeType.getId();
-	        if (sRuntime != null && sRuntime.getRuntimeType() != null && 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
-  /**
-   * Returns a WebServiceImpl given the id of a Web service implementation type.
-   * @param id 
-   * @return WebServiceImpl with the given id
-   * Returns null if such a WebServiceImpl cannot be found.
-   */
-  public static WebServiceImpl getWebServiceImplById(String id)
-  {
-    Object result = registry.webServiceImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceImpl)result;
-    }
-    return null;    
-  }
-  
-  /**
-   * Returns a {@link ServiceRuntimeDescriptor} given the id of a servicRuntime.
-   * @param id of a serviceRuntime
-   * @return ServiceRuntimeDescriptor with the given id
-   * Returns null if such a ServiceRuntimeDescriptor cannot be found.
-   */
-  public static ServiceRuntimeDescriptor getServiceRuntimeDescriptorById(String id)
-  {
-    Object result = registry.serviceRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (ServiceRuntimeDescriptor)result;
-    }
-    return null;        
-  }  
-  
-  /**
-   * Returns the {@link IWebServiceRuntime} of the given serviceRuntime. Extenders provide the fully 
-   * qualified name of a concrete IWebServiceRuntime in the class attribute of a serviceRuntimes extension.
-   * @param serviceRuntimeId id of a serviceRuntime
-   * @return IWebServiceRuntime
-   */
-  public static IWebServiceRuntime getServiceRuntime( String serviceRuntimeId )
-  {
-    ServiceRuntimeDescriptor descriptor = getServiceRuntimeDescriptorById(serviceRuntimeId);
-    IWebServiceRuntime    webserviceRuntime     = null;
-    if (descriptor != null)
-    {
-        webserviceRuntime = descriptor.getWebServiceRuntime();
-    }
-    
-    return webserviceRuntime;
-  }
-  
-  /**
-   * Returns the id of a serviceRuntime that supports the provided Web service type, Web service runtime,
-   * server type/server instance (if present), project or project type.
-   * @param trs an instance of {@link TypeRuntimeServer} containing a Web service type id, Web service runtime id,
-   * server type id and server instance id. The Web service type id and Web service runtime id must be non-null 
-   * and non-empty. The server type id and server instance id may be null or empty.
-   * @param projectName the name of an IProject thay may or mat not exist in the workspace. Must be non-null and 
-   * non-empty.
-   * @param templateId the id of an {@link IFacetedProjectTemplate}. Must be non-null and non-empty if
-   * an IProject with the name projectName does not exist in the workspace. 
-   * @return String id of a serviceRuntime that supports the provided Web service type, Web service runtime,
-   * server type/server instance (if present), project or project type. Returns an empty String if no 
-   * such serviceRuntime could be found.
-   */
-  public static String getServiceRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
-  {
-    boolean serverSelected = (trs.getServerId() != null) && (trs.getServerId().length() > 0); 
-    //Find the first serviceRuntime that supports the implementation type, runtime, server, and project
-    String[] descs = getServiceRuntimesByServiceType(trs.getTypeId(), trs.getServerId());
-    for (int i=0; i<descs.length; i++)
-    {
-      ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(descs[i]);      
-      if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
-      {
-        if (serverSelected)
-        {
-          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 "";
-    
-  }  
-  
-  /**
-   * Returns the Web service scenario from the Web service type.
-   * @param typeId must 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 Web service implementation type id.
-   * @return int scenario (e.g. WebServiceScenario.BOTTOM_UP or WebServiceScenario.TOP_DOWN)
-   */        
-  public static int getScenarioFromTypeId(String typeId)
-  {
-    return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
-  }
-  
-  /**
-   * Returns the Web service implemenation type id fron the Web service type id.
-   * @param typeId must 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 Web service implementation type id.
-   * @return String the WebServiceImpl id.
-   */        
-  public static String getWebServiceImplIdFromTypeId(String typeId)
-  {
-    return typeId.substring(typeId.indexOf("/")+1);
-  }    
-  
-  /**
-   * Returns the ids of all Web service runtimes that support the given
-   * Web service type.
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @return String[] array containing the ids of all Web service runtimes that
-   * support the given Web service type. The array may have 0 elements.
-   */
-  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[]{});
-  }
-  
-  /**
-   * Returns the ids of all serviceRuntimes that support the given
-   * Web service type.
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @returns String[] array containing the ids of all serviceRuntimes that
-   * support the given Web service type. The array may have 0 elements.
-   */
-  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[]{});
-  }  
-  
-  /**
-   * Returns the ids of all serviceRuntimes that support the given
-   * Web service type, with preferred server 
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @returns String[] array containing the ids of all serviceRuntimes that
-   * support the given Web service type. The array may have 0 elements.
-   */
-  public static String[] getServiceRuntimesByServiceType(String typeId, String preferredServerFactoryId) 
-  {
-	//    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin
-	//			.getInstance().getServerRuntimeContext();
-	//	String preferredRuntimeId = context.getRuntimeId();
-	//	String preferredServerFactoryId = context.getServerFactoryId();
-
-    int scenario = getScenarioFromTypeId(typeId);
-    String implId = getWebServiceImplIdFromTypeId(typeId);    
-    ArrayList ids = new ArrayList();
-    ArrayList idsPreferredByServer = 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(); 
-              if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId))
-            	  idsPreferredByServer.add(serviceRuntimeId);
-              else 
-            	  ids.add(serviceRuntimeId);
-            }
-            break;
-          case WebServiceScenario.TOPDOWN:
-            if (desc.getTopDown())
-            {
-              String serviceRuntimeId = desc.getId(); 
-              if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId))
-            	  idsPreferredByServer.add(serviceRuntimeId);
-              else 
-            	  ids.add(serviceRuntimeId);
-            }
-            break;
-          default:          
-        }
-      }
-    }
-    // append preferredRuntime after preferredRuntimeIdsListPreferredByServer
-    String[] preferredRuntimeIds = new String[idsPreferredByServer.size()+ids.size()];
-    Iterator itr1 = idsPreferredByServer.iterator();
-    int preferredRTCounter = 0;
-    while (itr1.hasNext()) {
-		String runtimeId = (String) itr1.next();
-		preferredRuntimeIds[preferredRTCounter++] = runtimeId;
-	}
-    
-    Iterator itr2 = ids.iterator();  
-     
-    while (itr2.hasNext()) {
-		String runtimeId = (String) itr2.next();
-		preferredRuntimeIds[preferredRTCounter++] = runtimeId;		
-	}
-
-    return preferredRuntimeIds;
-  }  
-  
-  /**
-   * Returns whether or not the given Web service runtime supports the given 
-   * Web service type.
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @param runtimeId id of a Web service runtime
-   * 
-   * @return boolean <code>true</code> if the given Web service runtime supports the given 
-   * Web service type. <code>false</code> otherwise.
-   */ 
-  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;
-  }  
-  
-  /**
-   * Returns the ids of all server types that support the given
-   * Web service type.
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @returns String[] array containing the ids of all server types that
-   * support the given Web service type. The array may have 0 elements. 
-   */
-  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 serviceRuntime        
-        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();
-  }
-  
-  /**
-   * Returns whether or not the given server type supports the given 
-   * Web service type.
-   * 
-   * @param typeId must 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 Web service implementation type id.
-   * 
-   * @param serverFactoryId id of a server type
-   * 
-   * @return boolean <code>true</code> if the given server type supports the given 
-   * Web service type. <code>false</code> otherwise.
-   */
-  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;
-  }
-  
-  /**
-   * Returns the ids of all server types that support the given
-   * serviceRuntime.
-   * 
-   * @param serviceRuntimeId id of a serviceRuntime
-   * 
-   * @returns String[] array containing the ids of all server types that
-   * support the given serviceRuntime. The array may have 0 elements. 
-   */   
-  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);
-  } 
-  
-
-  
-  /**
-   * Returns whether or not the given server type supports the given 
-   * serviceRuntime.
-   * 
-   * @param serviceRuntimeId id of a serviceRuntime
-   * @param serverFactoryId id of a server type
-   * 
-   * @return boolean <code>true</code> if the given server type supports the given 
-   * serviceRuntime. <code>false</code> otherwise.
-   */  
-  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;
-  }
-    
-  /**
-   * Returns the labels and ids of all Web service types. Used to populate the Web service type combo box on
-   * page 1 of the Web service wizard.
-   * @return {@link LabelsAndIds}
-   */
-  public static LabelsAndIds getServiceTypeLabels()
-  {   
-    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 = NLS.bind(ConsumptionUIMessages.BOTTOMUP_LABEL, new String[0]);
-        break;
-      case WebServiceScenario.TOPDOWN:
-        scenLabel = NLS.bind(ConsumptionUIMessages.TOPDOWN_LABEL, new String[0]);
-        break; 
-      default:
-      }
-      labels[index] = NLS.bind(ConsumptionUIMessages.COMBINED_TYPE_AND_RUNTIME_LABEL, new String[]{ scenLabel, impllabel });
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /**
-   * Returns the id of a Web service runtime that supports the given Web service type.
-   *  
-   * @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 Web service implementation type id.
-   * 
-   * @return String id of a Web service runtime that supports the given Web service type. 
-   * Returns null if such a Web service runtime cannot be found.
-   */
-  public static String getDefaultRuntimeValueFor(String typeId)
-  {
-    String[] srIds = getServiceRuntimesByServiceType(typeId);
-    if (srIds == null)
-    {
-      return null;
-    }
-    
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String preferredRuntimeId = context.getRuntimeId();
-    
-    String runtimeId;
-    
-    for (int i = 0; i < srIds.length; i++) {
-		runtimeId = getServiceRuntimeDescriptorById(srIds[i]).getRuntime().getId();
-		if (runtimeId.equals(preferredRuntimeId)) {
-			return runtimeId;
-		}
-	}
-    
-    // The preferred runtime does not support typeId.  Just return the first service runtime that does support typeId.
-    ServiceRuntimeDescriptor desc = getServiceRuntimeDescriptorById(srIds[0]);
-    return desc.getRuntime().getId();
-  }      
-
-  /**
-   * Returns the id of a Web service client runtime that supports the given Web service client type.
-   *  
-   * @param typeId The client type ID. 
-   * 
-   * @return String id of a Web service client runtime that supports the given Web service client type. 
-   * Returns null if such a Web service client runtime cannot be found.
-   */
-  public static String getDefaultClientRuntimeValueFor(String typeId)
-  {
-    String[] crIds = getClientRuntimesByType(typeId);     	
-    if (crIds == null)
-    {
-      return null;
-    }
-    
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String preferredRuntimeId = context.getRuntimeId();
-    
-    String runtimeId;
-    
-    for (int i = 0; i < crIds.length; i++) {
-		runtimeId = getClientRuntimeDescriptorById(crIds[i]).getRuntime().getId();
-		if (runtimeId.equals(preferredRuntimeId)) {
-			return runtimeId;
-		}
-	}
-    
-    // The preferred runtime does not support typeId.  Just return the first service runtime that does support typeId.
-    ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(crIds[0]);
-    return desc.getRuntime().getId();
-  }
-  
-  /**
-   * Returns the id of a server type that supports the given Web service type.
-   * Returns the server type ID from the preference if it supports the typeId.
-   *  
-   * @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 Web service implementation type id.
-   * 
-   * @return String id of a id of a server type that supports the given Web service type. 
-   * Returns null if such a server type cannot be found.
-   */    
-  public static String getDefaultServerValueFor(String typeId)
-  {
-    String[] fIds = getServerFactoryIdsByServiceType(typeId);
-    if (fIds==null || fIds.length==0)
-      return null;
-    
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String preferredServerFactoryId = context.getServerFactoryId();
-    for (int i = 0; i < fIds.length; i++) {
-		String serverTypeId = fIds[i];
-		if (serverTypeId.equals(preferredServerFactoryId)) {
-			return serverTypeId;
-		}
-	}
-    return fIds[0];
-  }    
- 
-  /**
-   * Returns the id of a server type that supports the given Web service client type.
-   * Returns the server type ID from the preference if it supports the typeId.
-   *   
-   * @param typeId The client type ID.
-   * 
-   * @return String id of a id of a server type that supports the given Web service client type. 
-   * Returns null if such a server type cannot be found.
-   */    
-	public static String getDefaultClientServerValueFor(String typeId)	{		
-		PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-		String preferredServerFactoryId = context.getServerFactoryId();
-		String first = null;//the first server found	  
-	    String[] crts = getClientRuntimesByType(typeId);
-
-	    if (crts != null)
-	    {
-	      for (int i = 0; i < crts.length; i++)
-	      {
-	        //Get the runtimes that work for the facets required for this serviceRuntime        
-	    	String[] fIds = getServerFactoryIdsByClientRuntime(crts[i]);
-	        for (int j=0; j<fIds.length; j++)
-	        {
-	          if (first == null) {
-	        	  first = fIds[j];
-	          }
-	          if (preferredServerFactoryId.equals(fIds[j])) {
-	        	  return fIds[j];//found the preferred one, stop searching and return it
-	          }
-	        }
-	      }    
-	    }
-	    return first;
-  }    
-  
-
-  /**
-   * Returns whether or not the given combination of server type, Web service runtime, and Web service type is
-   * supported. Used for validation.
-   * 
-   * @param serverFactoryId id of a server type
-   * @param runtimeId id of a Web service runtime
-   * @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 Web service implementation type id.
-   * 
-   * @return boolean <code>true</code> if the given combination of server type, Web service runtime, and Web service type is
-   * supported. <code>false</code> otherwise.
-   */
-  public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)  
-  {
-    //Ensure there is at least one serviceRuntime 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;
-  }  
-  
-  /**
-   * Returns an array of Web service type ids that are suitable for the provided selection.
-   * Used to default the Web service type combo box on page 1 of the Web service wizard
-   * based on the user's initial selection.
-   * @param selection
-   * @return String[] an array of Web service type ids that are suitable for the provided selection.
-   * Returns null if the selection is empty or no suitable Web service types are found.
-   */
-  public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
-  {
-    TypeSelectionFilter2 tsf = new TypeSelectionFilter2();
-    String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
-    return wst == null ? null : wst;
-  }    
-  
-  /**
-   * Returns whether or not the given server type supports the given Web service runtime
-   * 
-   * @param runtimeId : id of a Web service runtime
-   * @param factoryId : id of a server type
-   * @return boolean <code>true</code> if the given server type supports the given 
-   * Web service runtime for the service side. <code>false</code> otherwise.
-   */
-  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 serviceRuntime 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 serviceRuntime matched. Return false.
-    return false;
-  }
-  
-  /**
-   * Returns the id of a server type that supports the given Web service runtime
-   * on the service side.
-   * 
-   * @param runtimeId id of a Web service runtime
-   * @return String the id of a server type that supports the given Web service runtime.
-   * Returns null if such a server type cannot be found. 
-   */
-  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 serviceRuntime 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;
-  }  
-  
-  /**
-   * Returns the names of all projects in the workspace which support the given Web service type
-   * and Web service runtime.
-   * @param typeId must 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 Web service implementation type id.
-   * @param runtimeId id of a Web service runtime
-   * @return String[] array of project names. The array may have 0 elements.
-   */
-  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]);
-    
-  }
-  
-  /**
-   * Returns whether or not the given project supports the given Web service type and Web service runtime.
-   * @param typeId must 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 Web service implementation type id.
-   * @param runtimeId id of a Web service runtime
-   * @param projectName name of an IProject in the workspace
-   * @return boolean <code>true</code> if the project supports the given Web service type and 
-   * Web service runtime. Returns <code>false</code>
-   * <ul> 
-   * <li>if the project does not support the given Web service type and Web service runtime or</li>
-   * <li>if the project does not exist or</li>
-   * <li>if projectName is null or empty</li>
-   * </ul>
-   */
-  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;    
-    
-  }  
-  
-  /**
-   * Returns whether or not the given project supports the given serviceRuntime.
-   * @param serviceRuntimeId id of a serviceRuntime
-   * @param projectName name of an IProject in the workspace
-   * @return boolean <code>true</code> if the project supports the given
-   * serviceRuntime. Returns <code>false</code>
-   * <ul> 
-   * <li>if the project does not support the given serviceRuntime or</li>
-   * <li>if the project does not exist or</li>
-   * <li>if projectName is null or empty</li>
-   * </ul>
-   */  
-  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 an array of {@link IFacetedProjectTemplate} ids that support the given Web service type
-   * and Web service runtime.
-   * @param typeId must 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 Web service implementation type id.
-   * @param runtimeId id of a Web service runtime
-   * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service type
-   * and Web service runtime. The array may have 0 elements. Returns null if no serviceRuntimes supporting
-   * the given Web service type could be found.
-   */
-  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 serviceRuntime
-        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[]{});    
-  }
-
-  /**
-   * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given Web service type
-   * and Web service runtime.
-   * @param typeId must 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 Web service implementation type id.
-   * @param runtimeId id of a Web service runtime
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given 
-   * Web service type and Web service runtime. Returns <code>false</code> otherwise. 
-   */
-  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 serviceRuntime
-        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;    
-  }
-  
-  /**
-   * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given serviceRuntime.
-   * @param serviceRuntimeId id of a serviceRuntime
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given 
-   * serviceRuntime. Returns <code>false</code> otherwise.
-   */
-  public static boolean doesServiceRuntimeSupportTemplate(String serviceRuntimeId, String templateId)
-  {
-    //Get the templates for this serviceRuntime
-    Set templates = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(serviceRuntimeId);
-    IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
-    return templates.contains(checkingTemplate);
-  }  
-  
-  //Client-side utilities
-  /**
-   * Returns a WebServiceClientImpl given the id of a Web service client implementation type.
-   * @param id 
-   * @return {@link WebServiceClientImpl} with the given id
-   * Returns null if such a WebServiceClientImpl cannot be found.
-   */  
-  public static WebServiceClientImpl getWebServiceClientImplById(String id)
-  {
-    Object result = registry.webServiceClientImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceClientImpl)result;
-    }
-    return null;    
-  }
-  
-  /**
-   * Returns a {@link ClientRuntimeDescriptor} given the id of a clientRuntime.
-   * @param id of a clientRuntime
-   * @return ClientRuntimeDescriptor with the given id
-   * Returns null if such a ClientRuntimeDescriptor cannot be found.
-   */  
-  public static ClientRuntimeDescriptor getClientRuntimeDescriptorById(String id)
-  {
-    Object result = registry.clientRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (ClientRuntimeDescriptor)result;
-    }
-    return null;        
-  }    
-  
-  /**
-   * Returns the {@link IWebServiceRuntime} of the given clientRuntime. Extenders provide the fully 
-   * qualified name of a concrete IWebServiceRuntime in the class attribute of a clientRuntimes extension.
-   * @param clientRuntimeId id of a clientRuntime
-   * @return IWebServiceRuntime
-   */  
-  public static IWebServiceRuntime getClientRuntime( String clientRuntimeId )
-  {
-    ClientRuntimeDescriptor descriptor = getClientRuntimeDescriptorById(clientRuntimeId);
-    IWebServiceRuntime    webserviceRuntime     = null;
-    if (descriptor != null)
-    {
-        webserviceRuntime = descriptor.getWebServiceRuntime();
-    }
-    
-    return webserviceRuntime;
-  }
-  
-  /**
-   * Returns the id of a clientRuntime that supports the provided Web service client implementation type, Web service runtime,
-   * server type/server instance (if present), project or project type.
-   * @param trs an instance of {@link TypeRuntimeServer} containing a Web service client implementation type id, Web service runtime id,
-   * server type id and server instance id. The Web service client implementation type id and Web service runtime id must be non-null 
-   * and non-empty. The server type id and server instance id may be null or empty.
-   * @param projectName the name of an IProject thay may or mat not exist in the workspace. Must be non-null and 
-   * non-empty.
-   * @param templateId the id of an {@link IFacetedProjectTemplate}. Must be non-null and non-empty if
-   * an IProject with the name projectName does not exist in the workspace. 
-   * @return String id of a clientRuntime that supports the provided Web service client implementation type, Web service runtime,
-   * server type/server instance (if present), project or project type. Returns an empty String if no 
-   * such clientRuntime could be found.
-   */  
-  public static String getClientRuntimeId(TypeRuntimeServer trs, String projectName, String templateId)
-  {
-    boolean serverSelected = (trs.getServerId()!=null) && (trs.getServerId().length()>0);
-    //Find the first clientRuntime that supports the implementation type, runtime, server, and project
-    String[] descs = getClientRuntimesByType(trs.getTypeId(), trs.getServerId());
-    for (int i=0; i<descs.length; i++)
-    {
-      ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(descs[i]);      
-      if (desc.getRuntime().getId().equals(trs.getRuntimeId()))
-      {
-        if (serverSelected)
-        {
-          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 "";
-    
-  }
-  
-  /**
-   * Returns all Web service runtime ids for the client side.
-   * @return String[] array of Web service runtime ids for the client side.
-   * The array may have 0 elements. 
-   */
-  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[]{});
-  }
-  
-  /**
-   * Returns the ids of all clientRuntimes that support the given
-   * Web service client implementation type.
-   * @param clientImplId id of a Web service client implementation type
-   * @returns String[] array containing the ids of all clientRuntimes that
-   * support the given Web service client implementation type. The array may have 0 elements.
-   */
-  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[]{});
-  }  
-  
-  /**
-   * Returns the ids of all clientRuntimes that support the given
-   * Web service client implementation type and the preferred server
-   * @param clientImplId id of a Web service client implementation type
-   * @returns String[] array containing the ids of all clientRuntimes that
-   * support the given Web service client implementation type. The array may have 0 elements.
-   */
-  public static String[] getClientRuntimesByType(String clientImplId, String preferredServerFactoryId) 
-  {
-    ArrayList ids = new ArrayList();
-    ArrayList idsPreferredByServer = 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))
-      {
-    	  String clientRuntimeId = desc.getId();
-    	  if (desc.getRuntimePreferredServerType() != null && desc.getRuntimePreferredServerType().equals(preferredServerFactoryId)) {
-    		  idsPreferredByServer.add(clientRuntimeId);
-    	  } else {
-    		  ids.add(clientRuntimeId);
-    	  }
-      }
-    }
-    
- // append preferredRuntime after preferredRuntimeIdsListPreferredByServer
-    String[] preferredRuntimeIds = new String[idsPreferredByServer.size()+ids.size()];
-    Iterator itr1 = idsPreferredByServer.iterator();
-    int preferredRTCounter = 0;
-    while (itr1.hasNext()) {
-		String runtimeId = (String) itr1.next();
-		preferredRuntimeIds[preferredRTCounter++] = runtimeId;
-	}
-    
-    Iterator itr2 = ids.iterator();  
-     
-    while (itr2.hasNext()) {
-		String runtimeId = (String) itr2.next();
-		preferredRuntimeIds[preferredRTCounter++] = runtimeId;		
-	}
-
-    return preferredRuntimeIds;
-  }  
-  
-  /**
-   * Returns the ids of all Web service runtimes that support the given
-   * Web service client implementation type.
-   * @param clientImplId id of a Web service client implementation type
-   * @return String[] array containing the ids of all Web service runtimes that
-   * support the given Web service client implementation type. The array may have 0 elements.
-   */
-  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))
-      {
-        if (!runtimeIds.contains(desc.getRuntime().getId()))
-        {
-          runtimeIds.add(desc.getRuntime().getId());
-        }
-      }
-    }
-    
-    return (String[])runtimeIds.toArray(new String[]{});
-  }
-  
-  /**
-   * Returns whether or not the given Web service runtime supports the given 
-   * Web service client implementation type.
-   * @param clientImplId id of a Web service client implementation type
-   * @param runtimeId id of a Web service runtime
-   * @return boolean <code>true</code> if the given Web service runtime supports the given 
-   * Web service client implementation type. <code>false</code> otherwise.
-   */
-  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;
-  }
-  
-  /**
-   * Returns all server type ids with configured server runtimes.
-   * @return String[] array of server type ids. The array may have 0 elements.
-   */
-  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();    
-  }
-  
-  /**
-   * Returns the ids of all server types that support the given
-   * Web service client implementation type.
-   *  
-   * @param clientImplId id of a Web service client implementation type
-   * @return String[] array containing the ids of all server types that
-   * support the given Web service client implementation type. The array may have 0 elements.
-   */
-  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 serviceRuntime        
-        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[]{});
-  }  
-  
-  /**
-   * Returns whether or not the given server type supports the given 
-   * Web service client implementation type.
-   * @param clientImplId id of a Web service client implementation type
-   * @param serverFactoryId id of a server type
-   * @return <code>true</code> if the given server type supports the given 
-   * Web service client implementation type. <code>false</code> otherwise.
-   */
-  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;
-  }  
-  
-  /**
-   * Returns the ids of all server types that support the given
-   * clientRuntime.
-   * 
-   * @param clientRuntimeId id of a clientRuntime
-   * @return String[] array containing the ids of all server types that
-   * support the given clientRuntime. The array may have 0 elements.
-   */
-  public static String[] getServerFactoryIdsByClientRuntime(String clientRuntimeId)
-  {       
-    ClientRuntimeDescriptor desc = getClientRuntimeDescriptorById(clientRuntimeId);
-    Set facetRuntimes = getRuntimes(desc.getRequiredFacetVersions());
-
-    String[] fIds = getServerFactoryIdsByFacetRuntimes(facetRuntimes);
-    return fIds;    
-  }    
-
-  /**
-   * Returns whether or not the given server type supports the given 
-   * clientRuntime.
-   * 
-   * @param clientRuntimeId id of a clientRuntime
-   * @param serverFactoryId id of a server type
-   * @return boolean <code>true</code> if the given server type supports the given 
-   * clientRuntime. <code>false</code> otherwise.
-   */
-  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;
-  }
-  
-  /**
-   * Returns whether or not the given server type supports the given Web service runtime
-   * 
-   * @param runtimeId id of a Web service runtime
-   * @param factoryId id of a server type
-   * @return boolean <code>true</code> if the given server type supports the given 
-   * Web service runtime for the client side. <code>false</code> otherwise.
-   */
-  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 clientRuntime 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;
-  }    
-  
-  /**
-   * Returns the id of a server type that supports the given Web service runtime
-   * on the client side.
-   * 
-   * @param runtimeId id of a Web service runtime
-   * @return String the id of a server type that supports the given Web service runtime
-   * on the client side. Returns null if such a server type cannot be found.
-   */
-  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 clientRuntime 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;
-
-  }
-  
-
-  /**
-   * Returns whether or not the given combination of server type, Web service runtime, and 
-   * Web service client implementation type is supported. Used for validation.
-   * 
-   * @param serverFactoryId id of a server type
-   * @param runtimeId id of a Web service runtime
-   * @param clientImplId id of a Web service client implementation type
-   * @return boolean <code>true</code> if the given combination of server type, Web service runtime, 
-   * and Web service client implementation type is supported. <code>false</code> otherwise.
-   */
-  public static boolean isServerClientRuntimeTypeSupported(String serverFactoryId, String runtimeId, String clientImplId)  
-  {
-    //Ensure there is at least one clientRuntime 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 an array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
-   * and Web service runtime.
-   * 
-   * @param clientImplId id of a Web service client implementation type
-   * @param runtimeId id of a Web service runtime
-   * @return String[] array of {@link IFacetedProjectTemplate} ids that support the given Web service client implementation type
-   * and Web service runtime. The array may have 0 elements. Returns null if no clientRuntimes supporting
-   * the given Web service client implementation type could be found.
-   */
-  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 clientRuntime
-        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[]{});    
-  }  
-  
-  /**
-   * Returns whether or not the given {@link IFacetedProjectTemplate} supports the given 
-   * Web service client implementation type and Web service runtime.
-   * 
-   * @param clientImplId id of a Web service client implementation type
-   * @param runtimeId id of a Web service runtime
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given 
-   * Web service client implementation type and Web service runtime. Returns <code>false</code> otherwise. 
-   */
-  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 clientRuntime
-        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;    
-  }  
-  
-
-  /**
-   * Returns whether or not the given {@link IFacetedProjectTemplate} 
-   * supports the given clientRuntime
-   *  
-   * @param clientRuntimeId id of a clientRuntime
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return boolean <code>true</code> if the given {@link IFacetedProjectTemplate} supports the given 
-   * clientRuntime. Returns <code>false</code> otherwise.
-   */
-  public static boolean doesClientRuntimeSupportTemplate(String clientRuntimeId, String templateId)
-  {
-    //Get the templates for this clientRuntime
-    Set templates = FacetMatchCache.getInstance().getTemplatesForClientRuntime(clientRuntimeId);
-    IFacetedProjectTemplate checkingTemplate = ProjectFacetsManager.getTemplate(templateId);
-    return templates.contains(checkingTemplate);
-  }
-  
-  /**
-   * Returns the labels and ids of all Web service client implementation types. 
-   * Used to populate the Web service client type combo box on
-   * page 1 of the Web service wizard and Web service client wizard.
-   * @return {@link LabelsAndIds}
-   */  
-  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;
-
-  }  
-  
-  /**
-   * Returns all server type ids for which there are configured server runtimes
-   * present in the workspace.
-   * 
-   * @return String[] array of server type ids for which there are configured server runtimes
-   * present in the workspace. The array may have 0 elements.
-   */
-  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++)
-      {
-    	if (st == null || st.getRuntimeType() == null) break;    	  
-        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();
-        
-        if (rt != null)
-        {
-        	IRuntimeType rtType = rt.getRuntimeType();
-        	if (rtType != null)
-        	{
-		        String runtimeRuntimeTypeId = rtType.getId();
-		        if (serverTypeRuntimeTypeId.equals(runtimeRuntimeTypeId))
-		        {
-		          if (!fids.contains(st.getId()))
-		          {
-		            fids.add(st.getId());
-		          }
-		        }
-        	}
-        }
-      }
-    }
-   
-    return (String[])fids.toArray(new String[0]);
-  }
-  
-  /**
-   * Returns the names of all projects in the workspace which support the given Web service client 
-   * implementation type and Web service runtime.
-   * 
-   * @param typeId id of a Web service client implementation type
-   * @param runtimeId id of a Web service runtime
-   * @return String[] array of project names. The array may have 0 elements.
-   */
-  public static String[] getProjectsForClientTypeAndRuntime(String typeId, String runtimeId)
-  {
-    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]);
-    
-  }  
-  
-  /**
-   * Returns whether or not the given project supports the given Web service client implementation type 
-   * and Web service runtime.
-   * 
-   * @param typeId id of a Web service client implementation type
-   * @param runtimeId id of a Web service runtime
-   * @param projectName name of an IProject in the workspace
-   * @return boolean <code>true</code> if the project supports the given Web service type and 
-   * Web service runtime. Returns <code>false</code>
-   * <ul> 
-   * <li>if the project does not support the given Web service client implementation type and 
-   * Web service runtime or</li>
-   * <li>if the project does not exist or</li>
-   * <li>if projectName is null or empty</li>
-   * </ul>
-   */
-  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;
-    
-    
-  }  
-  
-  
-  /**
-   * Returns whether or not the given project supports the given clientRuntime.
-   * @param clientRuntimeId id of a clientRuntime
-   * @param projectName name of an IProject in the workspace
-   * @return boolean <code>true</code> if the project supports the given
-   * clientRuntime. Returns <code>false</code>
-   * <ul> 
-   * <li>if the project does not support the given clientRuntime or</li>
-   * <li>if the project does not exist or</li>
-   * <li>if projectName is null or empty</li>
-   * </ul>
-   */
-  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_;
-  
-  /**
-   * Returns the {@link SelectionListChoices} data structure representing the 
-   * server type > Web service runtime > J2EE cascading lists .
-   * {@link SelectionListChoices} is a data structure  which is like a cascading
-   * set of lists useful for populating a group of combo boxes in which the 
-   * selection in a given combo box determines the list of items used to populate
-   * the combo box below it. The Server Runtime preference page contains two combo
-   * boxes: one for server types and, below it, one for Web service runtimes.
-   * The server type combo box is meant to contain the list of all available server types
-   * that support at least one Web service runtime on either the client or service side. 
-   * The Web service runtime combo box is meant to contain the subset of Web service runtimes
-   * supported by the server type selected in the server type combo box.
-   * The SelectionListChoices returned by this method has three lists: server types, Web service runtimes,
-   * and J2EE levels. The first two lists correspond to the combo boxes on the preference
-   * page and are used to populate them. The J2EE levels list is a historical remnant from
-   * when J2EE levels used to be displayed on the preference page. It remains in this 
-   * data structure with some hard-coded values but is not rendered to the user. 
-   * 
-   * @return SelectionListChoices representing the server type > Web service runtime > J2EE cascading lists
-   */
-  public static SelectionListChoices getServerToRuntimeToJ2EE()
-  {
-    if (serverToRuntimeToJ2EE_!=null)
-    {
-      return serverToRuntimeToJ2EE_;
-    }
-    
-    //TODO (see bug 116025): Instead of all server type ids, we should be calculating the set of server
-    //types that support at least one Web service runtime on either the client or service side.
-    //Getting all server types for now.
-    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)
-  {
-	//TODO (see bug 116025): Instead of all Web service runtimes, we should be 
-	//calculating the subset of Web service runtimes supported by the server type
-	//with id equal to serverFactoryId. Getting all the Web service runtimes for now.
-    Set runtimes = registry.runtimes_.keySet();
-    Iterator itr = registry.runtimes_.keySet().iterator();
-    String[] runtimeIds = new String[runtimes.size()];    
-    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 have been removed from the Server Runtime preference page.
-    //Return some hard coded values. These will not be rendered on the preference page.
-    String[] j2eeVersions = new String[]{"13", "14"};
-    SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
-    return new SelectionListChoices(j2eeVersionsList, null);        
-  }  
-  
-  private static String[] getAllServerFactoryIds()
-  {
-    //TODO (see bug 116025): Instead of all server type ids, we should be calculating the set of server
-	//types that support at least one Web service runtime on either the client or service side.
-	//Return all server type ids for now.
-    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;
-  }  
-    
-  /**
-   * Returns a server type id given the server type's label
-   * @param label server type label
-   * @return server type id or null if no server type with the given 
-   * label is found.
-   */
-  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;
-    }       
-  }  
-  
-  /**
-   * Returns a Web service runtime's id given its label 
-   * @param label Web service runtime label
-   * @return Web service runtime id or null if no
-   * Web service runtime with the given label is found.
-   */
-  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);    
-  }    
-  
-    
-  /**
-   * Returns a set of facet runtimes that support the given
-   * required facet versions.
-   * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
-   * @return Set set of facet runtimes that support the given required facet versions.
-   * (element type: {@link IRuntime}) 
-   */
-  private static Set getRuntimes(RequiredFacetVersion[] requiredFacetVersions)
-  {
-    return FacetUtils.getRuntimes(requiredFacetVersions);
-  }
-  
-/**
- * Get the service runtime checker class
- * @param serviceRuntimeId service runtime ID
- * @return
- */
-  public static IWebServiceRuntimeChecker getServiceRuntimeChecker(String serviceRuntimeId) {
-	  return getServiceRuntimeDescriptorById(serviceRuntimeId).getServiceRuntimeChecker();
-	  
-  }
-
-/**
- * Get the client runtime checker class
- * @param clientRuntimeId
- * @return
- */
-public static IWebServiceRuntimeChecker getClientRuntimeChecker(String clientRuntimeId) {
-	  return getClientRuntimeDescriptorById(clientRuntimeId).getClientRuntimeChecker();
-	  
-  }
-
-/**
- * Get the service runtime preferred server type
- * @param serviceRuntimeId service runtime ID
- * @return
- */
-  public static String getServicePreferredServerType(String serviceRuntimeId) {
-	  return getServiceRuntimeDescriptorById(serviceRuntimeId).getRuntimePreferredServerType();
-	  
-  }
-
-/**
- * Get the client runtime preferred server type
- * @param clientRuntimeId
- * @return
- */
-public static String getClientPreferredServerType(String clientRuntimeId) {
-	  return getClientRuntimeDescriptorById(clientRuntimeId).getRuntimePreferredServerType();
-	  
-  }
-}
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 a8e2562..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,210 +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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
-import com.ibm.icu.util.StringTokenizer;
-
-
-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 185c898..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="webserviceutils"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<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 ad09d9c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
-webserviceutilssrc.zip
-wscsrc.zip
-javaCompiler.webserviceutils.jar.args
-javaCompiler.wsc.jar.args
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 0758941..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption</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.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 1426bed..0000000
--- 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 8135507..0000000
--- 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 86d8caa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,63 +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.310.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;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.bean;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.command.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.fragments;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common;x-internal:=true,
- org.eclipse.jst.ws.internal.consumption.wsfinder;x-internal:=true,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.internet.monitor.core;bundle-version="[1.0.102,1.1.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
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 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
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 5bb9bda..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-# -------- -------- -----------------------------------------------------------
-# 20070501   184505 kathy@ca.ibm.com - Kathy Chan
-###############################################################################
-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
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=256033              
-# jars.extra.classpath = ../javax.xml.soap/lib/saaj.jar
-extra.javax.xml.soap=platform:/plugins/javax.xml.soap/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 f2c1bac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/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 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 f6640aa..0000000
--- 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 60f08ba..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/Consumption.properties
+++ /dev/null
@@ -1,200 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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
-# -------- -------- -----------------------------------------------------------
-# 20060217   126757 rsinha@ca.ibm.com - Rupam Kuehner
-# 20060401   128827 kathy@ca.ibm.com - Kathy Chan
-# 20070509   182274 kathy@ca.ibm.com - Kathy Chan
-# 20080331   225032 makandre@ca.ibm.com - Andrew Mak, Error msg references renamed category
-# 20080402   222409 kathy@ca.ibm.com - Kathy Chan
-# 20080402   224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
-# 20080505   182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
-###############################################################################
-
-#
-# 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: {0}
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays: {0}
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans: {0}
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans: {0}
-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
-MSG_WARN_JTS_NON_INSTANTIABLE_TYPE=The input type {0} is a non-instantiable type and will be omitted from the sample JSP.  Continue with sample JSP generation?
-
-# 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 > Runtime Environments 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 and
-# MSG_ERROR_FIXED_FACETS 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_ERROR_FIXED_FACETS=Unable to set the following facets as fixed on project {0}: {1}.
-MSG_FACETS={0}, {1}
-
-MSG_ERROR_SETTING_RUNTIME=Unable to bind project {0} to the {1} runtime.
-
-#
-# Skeleton Merge Messages
-#
-MSG_ERROR_FILE_MERGE=Error in merging file {0}.
-MSG_ERROR_FILE_MERGE_LOAD=Error in loading file {0} for merge. 
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 d32724c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/ConsumptionMessages.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060217   126757 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060401   128827 kathy@ca.ibm.com - Kathy Chan
- * 20080402   224433 kathy@ca.ibm.com - Kathy Chan, Properties file change
- * 20080505   182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-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 MSG_WARN_JTS_NON_INSTANTIABLE_TYPE;
-	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_ERROR_FIXED_FACETS;
-    public static String MSG_FACETS;
-    public static String MSG_ERROR_SETTING_RUNTIME;
-    public static String MSG_ERROR_FILE_MERGE_LOAD;
-	public static String MSG_ERROR_FILE_MERGE;
-    
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, ConsumptionMessages.class);
-	}
-}
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 8a2774b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,245 +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
- * -------- -------- -----------------------------------------------------------
- * 20060811   153482 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-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 UNDERSCORE = '_';
-  public String getSessionBeanId()
-  {
-    String name = getClientFolderPath();
-    int index = name.lastIndexOf("/");
-    index++;
-    StringBuffer newName = new StringBuffer(name.substring(index));
-    
-    //We need to make this a valid java identifier
-    //To do this we will replace any character that is not valid with an underscore
-    for (int i = 0; i < newName.length(); i++)
-    {
-    	char c = newName.charAt(i);
-    	if (i == 0 && !Character.isJavaIdentifierStart(c) || !Character.isJavaIdentifierPart(c))
-    	{
-    		newName.setCharAt(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 eec9fdb..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 a0a7040..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 b94126b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 8cfc623..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 775be5f..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 3466462..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public MethodVisitor ()
-  {
-     super(BeanElement.REL_METHODS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ParameterVisitor ()
-  {
-     super(MethodElement.REL_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f62070..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ReturnParameterVisitor ()
-  {
-     super(MethodElement.REL_RETURN_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public TypeVisitor ()
-  {
-    super(TypeElement.REL_TYPE);
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index 6396e9f..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 6460bff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 1ae28a1..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 1f3ca29..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 7fec64d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070313   176580 makandre@ca.ibm.com - Andrew Mak, Generate a Client WS Proxy accepting URL
- *******************************************************************************/
-
-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)
-        	  return true;
-       }
-    }
-    return false;
-
-  }
-
- /**
-  * 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 964257a..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 1151664..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 42f541e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 6544a0c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070410   180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- * 20080505   182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.List;
-
-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.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-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.TypeElement;
-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 if (javaClass != null && !getReturnParam() &&
-				// the following cases cannot be instantiated for input
-				(javaClass.isInterface() || javaClass.isAbstract() || !hasDefaultConstructor(javaClass))) {
-	    	
-	    	Element element = BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-	    	element.setPropertyAsObject(TypeElement.NON_INSTANTIABLE, Boolean.TRUE);
-    		status = StatusUtils.warningStatus(
-    				ConsumptionMessages.bind(ConsumptionMessages.MSG_WARN_JTS_NON_INSTANTIABLE_TYPE, element.getName()));
-	    }
-	    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 );
-       }
-       status = Status.OK_STATUS; // user says it's OK
-     }
-     //
-     return status;
-   }
-
-  /**
-   * Determine if the given javaClass has a default constructor.
-   * @param javaClass The java class
-   * @return true if javaClass has a default constructor, false otherwise
-   */
-  private boolean hasDefaultConstructor(JavaClass javaClass) {
-	   
-	  List methods = javaClass.getMethods();
-	  Iterator iter = methods.iterator();
-	   
-	  boolean foundConstructor = false;
-	   
-	  while (iter.hasNext()) {
-		  Method method = (Method) iter.next();
-		   
-		  if (method.getName().equals(javaClass.getName())) {
-			  if (method.listParametersWithoutReturn().length == 0)
-				  return method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC;
-			  foundConstructor = true;
-		  }
-	  }
-	   
-	  // if no constructor is found at this point, a default one is implicitly provided
-	  return !foundConstructor;
-  }
-}
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 fe4a2e3..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 0c52993..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080505   182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-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);   
-        if (status.getSeverity() == IStatus.ERROR)
-    	  break;
-      }
-    } 
-   
-    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 773abb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 7f0f0eb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 d32ee8d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080505   182167 makandre@ca.ibm.com - Andrew Mak, Warning not issued when non-instantiable class is bypassed in sampe JSPs
- *******************************************************************************/
-
-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);  
-          if (status.getSeverity() == IStatus.ERROR)
-        	  break;
-        }
-      }
-      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 74904b6..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 118fc86..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 07311fb..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 900cf8a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060921 [158210] kathy@ca.ibm.com - Kathy Chan, Calling incremental build on the project before adding to server
- * 20080415   227237 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090518 [252077] tangg@emc.com - Gary Tang, Fail to deploy an EAR project if it contains a module
- *                   kchong@ca.ibm.com - Keith Chong, (updated patch)
- * 20090929   250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.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 = null;
-	    if(!(serverInstanceId == null))
-	    	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))
-	    {
-	    	// Get the IModule as specified by the module name
-	    	IModule imodule = ServerUtils.getModule(iproject, module);
-
-	    	// TODO:  This workaround for 156768 should be removed once the defect is fixed
-	    	if (imodule == null) {
-	    	    // calling incremental build on the project before trying again
-	    		iproject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD,null);
-	    			    		
-	    		imodule = ServerUtils.getModule(iproject);
-	    		if (imodule == null) {  
-	    			// return error if module is still null after 1 retry
-	    			status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}) );
-	    			env.getStatusHandler().reportError(status);
-	    			return status;
-	    		}
-	    	}
-	    	// end of workaround for 156768
-	    	
-	      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}), e);
-	      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 }), ce);
-	        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 82ab8a3..0000000
--- 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/BuildBeanCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
deleted file mode 100644
index f04f119..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildBeanCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20081111   252062 mahutch@ca.ibm.com - Mark Hutchinson, Don't depend on AutoBuild to compile bean
- *******************************************************************************/
-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.IncrementalProjectBuilder;
-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.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class BuildBeanCommand extends AbstractDataModelOperation {
-
-	private IProject project_;
-	
-	/*
-	 * This Command builds the service project, and all projects it references. This is different from the
-	 * BuildProjectCommand which only builds the service project
-	 */
-	public BuildBeanCommand() {
-		//default constructor
-	}
-	
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IProject[] referencedProjects;
-		
-		try {
-			referencedProjects = project_.getReferencedProjects();
-			for (int i = 0; i < referencedProjects.length; i++) {
-				referencedProjects[i].build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-			}
-			project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
-			
-		} catch (Exception e) {
-			return StatusUtils.errorStatus(e);
-		}
-		return Status.OK_STATUS;
-	}
-	
-	
-	  /**
-	   * @param project the service project to be built.
-	   */
-	  public void setProject(IProject project) {
-	    this.project_ = project;
-	  }
-
-}
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 fb19f00..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20090929   250984 mahutch@ca.ibm.com - Mark Hutchinson, remove "wait for auto build" joins
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.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.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)
-    {
-    }
-    
-     
-    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 681f3b9..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 579f7d2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20080613   237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint
- * 20080715   240722 makandre@ca.ibm.com - Andrew Mak, Cannot setup TCP/IP Monitor for soap12 endpoints
- *******************************************************************************/
-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.monitor.ExtensibilityElementTransformerRegistry;
-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();
-              String location = null;
-              if (ext instanceof SOAPAddress)
-            	location = ((SOAPAddress)ext).getLocationURI();
-              else
-            	location = ExtensibilityElementTransformerRegistry.INSTANCE.transform(ext);
-              if (location != null)
-              {
-                if (location.startsWith("https://"))
-                	location = "http://" + location.substring(8);
-                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;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java
deleted file mode 100644
index c99346d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeProxyEndpointCommand.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20080613   237116 makandre@ca.ibm.com - Andrew Mak, Web service monitoring fails on https endpoint
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-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 ComputeProxyEndpointCommand extends AbstractDataModelOperation
-{
-  private Boolean monitorService;
-  private Integer monitoredPort;
-  private String proxyEndpoint;
-  private String endpoint;
-
-  public ComputeProxyEndpointCommand()
-  {
-  }
-
-  /**
-   * @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;
-  }
-  
-  public String getEndpoint()
-  {
-  	if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
-  	{
-  		// Use the endpoint that matches with the proxy the extension passes to us if it is set
-  		if (proxyEndpoint != null) {
-  			String location = proxyEndpoint;
-  			if (location.startsWith("https://"))
-            	location = "http://" + location.substring(8);
-  			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();
-                }
-			}
-  		} else {
-  			return endpoint;
-  		}
-  	}
-  	return null;
-  }
-
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-  
-  /**
-   * @param proxyEndpoint The proxyEndpoint to set.
-   */
-  public void setProxyEndpoint(String proxyEndpoint) {
-  	this.proxyEndpoint = proxyEndpoint;
-  }
-  /**
-   * @param endpoint The endpoint to set.
-   */
-  public void setEndpoint(String endpoint) {
-  	this.endpoint = endpoint;
-  }
-}
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 9834948..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,362 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20061213   165723 kathy@ca.ibm.com - Kathy Chan
- * 20061213   165725 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-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.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();
-    CopyWSDLRunnable copyWSDLRunnable = new CopyWSDLRunnable(env);
-    try
-    {
-      ResourceUtils.getWorkspace().run(copyWSDLRunnable, null);
-      return Status.OK_STATUS;
-    }
-    catch (CoreException ce)
-    {
-        IStatus status = ce.getStatus();
-		env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-   
-  private class CopyWSDLRunnable implements IWorkspaceRunnable {
-  	
-  	private IEnvironment environment = null;
-  	
-  	protected CopyWSDLRunnable(IEnvironment env){
-  		environment = env;
-  	}
-  	public void run(IProgressMonitor pm) throws CoreException {
-  		ignoreList = new Vector();
-  		if (def == null)
-  			def = webServicesParser.getWSDLDefinition(wsdlURI);
-  		try {
-  			copyWSDL(environment, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
-  		} catch (Throwable e) {
-  			throw new CoreException(StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COPY_WSDL, new String[]{wsdlURI, destinationURI}), e));
-  		}
-  	}
-  }
-  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
-  {
-	uri = normalize(uri);
-	if (!needToCopy(uri)) {
-	   	return;
-	}
-	destURI = normalize(destURI);
-    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
-  {
-	  uri = normalize(uri);
-	  if (!needToCopy(uri)) {
-	    	return;
-	    }
-	  destURI = normalize(destURI);
-    // 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 normalizedURI) {	
-	  if (ignoreList.contains(normalizedURI))
-		  return false;
-	  ignoreList.add(normalizedURI);
-	  return true;
-  }
-  
-//normalize the uri to remove relative addressing "/.."
-  private String normalize(String uri )
-  {
-  	boolean normalized = false;
-  	while(!normalized){
-  	  int dir = uri.indexOf("/..");
-  	  if(dir == -1)
-  	  	normalized = true;
-  	  else{
-  	  	String first = uri.substring(0,dir);
-  	    String second = uri.substring(dir + 3);
-  	    int newIndex = first.lastIndexOf("/");
-  	    if(newIndex == -1){
-  	    	normalized = true;
-  	    } else {
-  	    	first = first.substring(0,newIndex);
-  	    	uri = first + second;
-  	    }
-  	  }
-  	}
-  	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/CopyWSDLTreeCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
deleted file mode 100644
index 0bedb2e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLTreeCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070112   165721 makandre@ca.ibm.com - Andrew Mak, WSDL import cannot use relative import with to parent directories
- * 20070125   171071 makandre@ca.ibm.com - Andrew Mak, Create public utility method for copying WSDL files
- * 20070409   181635 makandre@ca.ibm.com - Andrew Mak, WSDLCopier utility should create target folder
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import javax.wsdl.Definition;
-
-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.ResourceUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-/**
- * @deprecated Use {@link WSDLCopier} instead. 
- */
-public class CopyWSDLTreeCommand extends AbstractDataModelOperation
-{
-  private String wsdlURI;
-  private WebServicesParser webServicesParser;
-  private String destinationURI;
-  private Definition def;
-  private String wsdlRelPath;
-  
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IEnvironment env = getEnvironment();
-    
-    try
-    {
-      WSDLCopier copier = new WSDLCopier(webServicesParser);        
-      copier.setSourceURI(wsdlURI, def);
-      copier.setTargetFolderURI(getBaseURI(destinationURI));
-      copier.setTargetFilename(getLocalname(destinationURI));
-        
-      ResourceUtils.getWorkspace().run(copier, monitor);
-        
-      wsdlRelPath = copier.getRelativePath().toString();
-
-      return Status.OK_STATUS;
-    }
-    catch (CoreException ce)
-    {
-        IStatus status = ce.getStatus();
-		env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-  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;
-  }
- 	  
-  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;
-  }
-  
-  public String getWSDLRelPath() {
-    return wsdlRelPath;
-  }
-}
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 e688e63..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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      
- * 20060217 126757   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060221 119111   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427 126780   rsinha@ca.ibm.com - Rupam Kuehner
- * 20060517 126965   kathy@ca.ibm.com - Kathy Chan
- * 20060905   156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070505   184772 kathy@ca.ibm.com - Kathy Chan
- * 20080305   220371 kathy@ca.ibm.com - Kathy Chan
- * 20080305   220371 kathy@ca.ibm.com - Kathy Chan - reverting previous change to 220371
- * 20080326   220371 kathy@ca.ibm.com - Kathy Chan - re-applying 220371
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- *******************************************************************************/
-
-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.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.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.componentcore.internal.util.IModuleConstants;
-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.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.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
-{
-
-  //name of the project to be created
-  private String   projectName; 
-
-  //name of the EAR project associated with projectName
-  private String   earProjectName; 
-
-  //id of the IFacetedProjectTemplate to be used to create this project.
-  private String   templateId;
-  
-  //required facet versions that must be satisfied when creating the project (this comes from
-  //the selected serverRuntime or clientRuntime in the calling scenario)
-  private RequiredFacetVersion[]   requiredFacetVersions;
-
-  //server type id - used to determine the facet runtime the created project will be bound to
-  //if serverInstanceId is null or empty
-  private String   serverFactoryId;
-
-  //server id - used to determine the facet runtime the created project will be bound to. May
-  //be null or empty.
-  private String   serverInstanceId;
-  
-  //facet runtime determined from the serverInstanceId or serverFactoryId
-  private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime;
-  
-  
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-  {
-    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
-      {
-        status = FacetUtils.createNewFacetedProject(projectName);
-        if (status.getSeverity() == IStatus.ERROR)
-        {
-          return status;
-        }
-        
-        IProject createdProject = ProjectUtilities.getProject(projectName);
-        IFacetedProject fproject = ProjectFacetsManager.create(createdProject);
-        
-        //Get the facet versions to install. 
-        Set facetsToAdd = getFacetsToAdd();
-        
-        //Install the facet versions
-        status = FacetUtils.addFacetsToProject(fproject, facetsToAdd);
-        if (status.getSeverity() == IStatus.ERROR)
-        {
-          return status;
-        }        
-        
-        //Set the installed facet versions as fixed.
-        Set newFacetVersions = fproject.getProjectFacets();
-        Set fixedFacets = new HashSet();
-        for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) {
-            IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next();
-            fixedFacets.add(facetVersion.getProjectFacet());
-        }
-        status = FacetUtils.setFixedFacetsOnProject(fproject, fixedFacets);
-        if (status.getSeverity() == IStatus.ERROR)
-        {
-          return status;
-        }                
-        
-        
-        //Set the runtime        
-        if (facetRuntime != null)
-        {
-          status = FacetUtils.setFacetRuntimeOnProject(fproject, facetRuntime);
-        }
-
-        // add facets required by Web service runtime
-        if (requiredFacetVersions.length != 0) {
-        	status = FacetUtils.addRequiredFacetsToProject(project, requiredFacetVersions, monitor);
-        	if (status.getSeverity() == Status.ERROR)
-        	{
-        		return status;
-        	}      
-        }
-             
-        if (facetRuntime != null)
-        {
-        	// add the default facets that's not in conflict with the existing facets
-        	Set projectFacetVersionSet = fproject.getProjectFacets();
-        	Set projectFacetSet = new HashSet();
-        	// get the project facet from the project facet version we calculated
-        	for (Iterator iter = projectFacetVersionSet.iterator(); iter.hasNext();) {
-        		IProjectFacetVersion pfv = (IProjectFacetVersion) iter.next();
-        		projectFacetSet.add(pfv.getProjectFacet());
-        	}
-        	try {
-        		Set defaultProjectFacetVersionSet = facetRuntime.getDefaultFacets(projectFacetSet);
-        		// The returned defaultFacetSet contains the original projectFacetSet passed into getDefaultFacets
-        		// plus any default facets that are not in conflict with the original projectFacetSet.
-        		// Add to facetsToAdd if the the default facet is not in the original set.
-        		Set defaultFacetsToAdd = new HashSet();
-        		for (Iterator iter = defaultProjectFacetVersionSet.iterator(); iter.hasNext();) {
-        			IProjectFacetVersion defaultProjFacetVersion = (IProjectFacetVersion) iter.next();
-        			if( ! projectFacetSet.contains( defaultProjFacetVersion.getProjectFacet() ) )
-        			{
-        				defaultFacetsToAdd.add(defaultProjFacetVersion);
-        			}
-        		}
-        		if (!defaultFacetsToAdd.isEmpty()) {
-        			status = FacetUtils.addFacetsToProject(fproject, defaultFacetsToAdd);
-        			if (status.getSeverity() == IStatus.ERROR)
-        			{
-        				return status;
-        			}    
-        		}
-        	} catch (CoreException e) {
-        		// If there's any exception when trying to get the default facet, just ignore the default facet
-        		// and return the original facetsToAdd.
-        	}
-        	// end of adding default facets
-        }
-      } catch (CoreException ce)
-      {
-        return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
-      }
-    }
-    return status;
-  }
-    
-  private IStatus checkDataReady()
-  {
-
-	if (projectName == null)
-    {
-      return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] {projectName}));
-    }
-
-    return Status.OK_STATUS;
-  }
-  
-  /**
-   * Returns the set of facets to install on the new project. The set will consist
-   * of the highest version of each of the template's fixed facets that satisfies
-   * the required facet versions, the facet runtime, and the EAR project J2EE level.
-   * @return Set a Set containing elements of type IProjectFacetVersion.
-   */
-  private Set getFacetsToAdd()
-  {
-    Set facets = null;
-    
-    //Set the facet runtime.
-    setFacetRuntime();
-    //Get all facet version combinations for the template in order of ascending version numbers.
-    Set[] allCombinations = FacetSetsByTemplateCache.getInstance().getFacetVersionCombinationsFromTemplate(templateId);
-    int n = allCombinations.length;
-    if (facetRuntime != null)
-    {
-      //Walk the facet version combinations in order of descending version numbers.
-      for (int i=n-1; i>=0; i--)
-      {
-        //Check this template combination to see if it is compatible with the 
-        //required facet versions, the server runtime, and the EAR. If it is, choose it.
-        Set combination = allCombinations[i];
-        FacetMatcher fm = FacetUtils.match(requiredFacetVersions, combination);
-        if (fm.isMatch())
-        {
-          //Check against Runtime & EAR
-          if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, combination)  && doesEARSupportFacets(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;
-        }                
-      }      
-    }
-   
-    //Unlikely to get to this point in the code, but if we do, choose the highest version
-    //of each fixed facet in the template that is supported by the server runtime
-    if (facets == null)
-    {
-      facets = getHighestFacetVersionsFromTemplateAndServer();
-    }
-     
-    return facets;
-  }
-
-  /**
-   * Sets the facetRuntime attribute based on the serverInstanceId or serverFactoryId
-   * Preference is given to non-stub facet runtimes.
-   */
-  private void setFacetRuntime()
-  {
-    
-	  if (serverInstanceId != null && serverInstanceId.length()>0)
-	  {
-		  IServer server = ServerCore.findServer(serverInstanceId);
-		  IRuntime sRuntime = server.getRuntime();
-		  facetRuntime = FacetUtil.getRuntime(sRuntime);      
-	  }
-	  else
-	  {
-		  if (serverFactoryId != null && serverFactoryId.length() > 0)
-		  {
-			  //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 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;
-  }
-  public void setEarProjectName(String earProject) {
-	  this.earProjectName = earProject;
-  }
-  
-	private RequiredFacetVersion[] getRequiredWebFacets() {
-		return new RequiredFacetVersion[] { getRequiredFacetVersion(
-				IModuleConstants.JST_WEB_MODULE,
-				J2EEUtils.getWebJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
-	}
-
-	private RequiredFacetVersion[] getRequiredAppClientFacets() {
-		return new RequiredFacetVersion[] { getRequiredFacetVersion(
-				IModuleConstants.JST_APPCLIENT_MODULE,
-				J2EEUtils.getAppClientJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
-	}
-
-	private RequiredFacetVersion[] getRequiredEJBFacets() {
-		return new RequiredFacetVersion[] { getRequiredFacetVersion(
-				IModuleConstants.JST_EJB_MODULE,
-				J2EEUtils.getEJBJ2EEVersionFromEARJ2EEVersion(ProjectUtilities.getProject(earProjectName))) };
-	}
-
-	private boolean doesEARSupportFacets(Set combination) {
-		try {
-
-			if (earProjectName == null || earProjectName.length() == 0
-					|| !ProjectUtilities.getProject(earProjectName).exists())
-				// the ear does not exist or the project type template is
-				// undefined
-				return true;
-			else {
-				if (combinationContainsFacet(combination, IModuleConstants.JST_WEB_MODULE))
-					return FacetUtils
-							.match(getRequiredWebFacets(), combination)
-							.isMatch();
-				else if (combinationContainsFacet(combination, IModuleConstants.JST_EJB_MODULE))
-					return FacetUtils
-							.match(getRequiredEJBFacets(), combination)
-							.isMatch();
-				else if (combinationContainsFacet(combination, IModuleConstants.JST_APPCLIENT_MODULE))
-					return FacetUtils.match(getRequiredAppClientFacets(),
-							combination).isMatch();
-				else
-					return true;
-			}
-		} catch (Exception e) {
-			return true;
-		}
-	}
-
-	private boolean combinationContainsFacet(Set combination, String facetName) {
-		if (combination == null || facetName == null || facetName.length() == 0)
-			return false;
-        for (Iterator iter = combination.iterator(); iter.hasNext();) {
-        	IProjectFacetVersion nextFacetVersion = (IProjectFacetVersion) iter.next();
-        	if (facetName.equals(nextFacetVersion.getProjectFacet().getId()))
-        			return true;
-		}
-        return false;
-	}
-
-	private RequiredFacetVersion getRequiredFacetVersion(String facetName,
-			String facetVersion) {
-		IProjectFacet projectFacet = ProjectFacetsManager
-				.getProjectFacet(facetName);
-		IProjectFacetVersion projFacetVersion = projectFacet
-				.getVersion(facetVersion);
-		RequiredFacetVersion reqFacetVersion = new RequiredFacetVersion();
-		reqFacetVersion.setAllowNewer(false);
-		reqFacetVersion.setProjectFacetVersion(projFacetVersion);
-		return reqFacetVersion;
-	}
-
-	  private Set getHighestFacetVersionsFromTemplateAndServer()
-	  {
-	    IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-	    Set fixedFacets = template.getFixedProjectFacets(); 
-	    HashSet initial = new HashSet(); 
-	    for (Iterator itr = fixedFacets.iterator(); itr.hasNext(); ) 
-	    { 
-	      IProjectFacet facet = (IProjectFacet) itr.next(); 
-	      IProjectFacetVersion highestFacetVersion = null;
-	      try {
-	    	  highestFacetVersion = facet.getLatestSupportedVersion(facetRuntime);
-	      } catch (CoreException e) {
-	    	  try {
-	    		  highestFacetVersion = facet.getLatestVersion();
-	    	  } catch (CoreException e2) {
-	    		  //not much we can do here
-	    	  }
-	    	  
-	      }
-	      initial.add(highestFacetVersion); 
-	    }             
-	    
-	    return initial;
-	  }
-}
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 dc90342..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/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 84b886c..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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;
-  }
-}
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 d05873c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20071210   203826 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-
-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 serverRuntimeId;
-	private String serverInstanceId;
-	
-	/**
-	 * Creates a server of the factory id using the server runtime Id if provided
-	 * 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) {
-				
-				IRuntime serverRuntime = null;
-				if (serverRuntimeId != null) {
-					serverRuntime = ServerCore.findRuntime(serverRuntimeId);  // may return null if no runtime is found
-				}
-				
-				if (serverRuntime == null) { // either serverRuntimeId is null or did not find a runtime with that Id
-					//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;					
-					}
-
-					serverRuntime = nonStubRuntime;
-				} 
-				
-				if (env!=null)
-				{
-					serverWC = serverType.createServer(null, null, serverRuntime, monitor );
-				}
-				else
-				{					
-					serverWC = serverType.createServer(null, null, serverRuntime, 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 void setServerRuntimeId(String serverRuntimeId)
-	{
-		this.serverRuntimeId = serverRuntimeId;
-	}
-	
-	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 012ccbf..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 845dfcf..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/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 f5e2931..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 94ece1e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/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 ba15238..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 f7e97f5..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 774a0f2..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 26fd2e7..0000000
--- 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, 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.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 7d6535a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetSetsByTemplateCache.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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)
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20070402 151943   sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-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.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;
-
-
-/**
- * FacetSetsByTemplateCache caches the sets of facet version combinations for templates.
- */
-public class FacetSetsByTemplateCache
-{
-  // single instance per workbench
-  private static FacetSetsByTemplateCache instance_;
-  
-  //facetSetsByTemplateId_: 
-  //key: Object of type String. String id of an IFacetedProjectTemplate.
-  //value: Object of Set[]. An array of Sets where each set contains elements of type IProjectFacetVersion.
-  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();
-  }  
-  
-  /**
-   * Returns all the valid facet version combinations that can be derived from the fixed facets
-   * of the given template. For example, if the template has two fixed facets, A and B,
-   * and A has versions 1.0 and 2.0, B has versions 1.1, 2.1,
-   * the following array of Sets will be returned (assuming for the sake of the example
-   * that all the combinations are valid):<br/>
-   * {Set1, Set2, Set3, Set4}, where<br/>
-   * Set1 = [A1.0, B1.1]<br/>
-   * Set2 = [A2.0, B1.1]<br/>
-   * Set3 = [A1.0, B2.1]<br/>
-   * Set4 = [A2.0, B2.1]<br/>
-   * <br/>
-   * @param templateId id of an {@link IFacetedProjectTemplate}
-   * @return Set[] An array of Sets where each set contains elements of type {@link IProjectFacetVersion}.
-   */
-  public synchronized Set[] getFacetVersionCombinationsFromTemplate(String templateId)
-  {
-	//Return the cached combinations if present.
-    Set[] cachedCombinations = (Set[])facetSetsByTemplateId_.get(templateId);
-    if (cachedCombinations != null)
-    {
-      return cachedCombinations;
-    }
-    else
-    {
-
-      //Combinations have not yet been cached for the given template. 
-      //Determine the combinations and cache them.
-      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
-        {
-          // Get the facet versions in ascending order.
-          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]));
-          
-
-        }
-      }
-      Set[] allValidCombinationsArray = new HashSet[0];
-      if (projectFacetVersionArrays.size()>0) {
-    	  IProjectFacetVersion[][] arrayOfProjectFacetVersionArrays = (IProjectFacetVersion[][])projectFacetVersionArrays.toArray(new IProjectFacetVersion[0][0]);
-    	  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 db7e772..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ /dev/null
@@ -1,1530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation. - initial API and implementation
- * 20070523   158230 kathy@ca.ibm.com - Kathy Chan
- * 20071219   213356 kathy@ca.ibm.com - Kathy Chan
- * 20080325   222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- * 20080429   213730 trungha@ca.ibm.com - Trung Ha
- * 20080507   229532 kathy@ca.ibm.com - Kathy Chan
- * 20090818   286859 zina@ca.ibm.com - Zina Mostafia
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-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.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.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.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-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.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-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.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;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * FacetUtils contains utility methods related to facets and templates.
- * <br/><br/>
- * Terminology used in the Javadoc in this class
- * <ul>
- * <li><b>facet</b>: An {@link IProjectFacet}</li>
- * <li><b>facet version</b>: An {@link IProjectFacetVersion} </li>
- * <li><b>facet runtime</b>: An {@link IRuntime}</li>
- * <li><b>faceted project</b>: An {@link IFacetedProject}. A faceted project may be obtained
- * from an IProject (@see ProjectFacetsManager#create)</li>
- * <li><b>template</b>: An {@link IFacetedProjectTemplate}. Conceptually this is similar to a project type.</li>
- * <li><b>required facet version</b>: A {@link RequiredFacetVersion}. Used by serviceRuntimes and clientRuntimes
- * to identify what they require in terms of facet versions.</li>
- * </ul>
- */
-public class FacetUtils
-{
-
-  /**
-   * Returns an array 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
-        {
-        	if (ResourceUtils.isJavaProject(projects[i]))
-        	{
-              validProjects.add(projects[i]);
-        	}
-        }
-      }
-      catch (CoreException ce)
-      {        
-      }      
-    }
-    return (IProject[])validProjects.toArray(new IProject[]{});
-  }
-  
-  /**
-   * Returns the facet versions on the given project.
-   * @param projectName name of an existing project.
-   * @returns Set containing elements of type {@link IProjectFacetVersion}. 
-   * These are the facet versions currently installed on this project. If the project
-   * is a Java project, facets are inferred from the Java project. Returns null 
-   * <ul>
-   * <li>if the project is not a faceted project or a Java project or</li>
-   * <li>if the project does not exist or</li>
-   * <li>if the project is null</li>
-   * </ul>  
-   */
-  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;              
-          if (ResourceUtils.isJavaProject(project))
-          {
-        	javaProject = JavaCore.create(project);
-            facetVersions = FacetUtils.getFacetsForJavaProject(javaProject);
-          }
-        }
-      } catch (CoreException ce)
-      {
-    	  //Leaving the catch block empty. This method will return null if there
-    	  //were any blow-ups in the facet API being called.
-      }      
-    }
-    
-    return facetVersions;
-    
-  }
-
-  /**
-   * Returns the facet runtime the given project is bound to.
-   * @param projectName name of an existing project
-   * @return {@link IRuntime} the project is bound to. Returns null
-   * <ul>
-   * <li>if the project is not bound to a facet runtime</li> 
-   * <li>if the project does not exist</li>
-   * <li>if the project is null</li>
-   * </ul>
-   */
-  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.getPrimaryRuntime();
-        }
-      } catch (CoreException ce)
-      {
-    	  //Leaving the catch block empty. This method will return null if there
-    	  //were any blow-ups in the facet API being called.
-      }
-    }
-    
-    return null;    
-  }
-  
-  
-  /**
-   * Returns a set of combinations of facet versions derived from the facet versions
-   * in the provided arrayOfProjectFacetVersionArrays. For example, if 
-   * arrayOfProjectFacetVersionArrays is a two dimenstional array of facet versions that has
-   * a structure like this:<br/>
-   * {{FacetA_version1, FacetA_version2},<br/>
-   *  {FacetB_version1},<br/>
-   *  {FacetC_version1, FacetC_version2}}<br/>
-   * the following array of Sets will be returned:<br/>
-   * {Set1, Set2, Set3, Set4}, where<br/>
-   * Set1 = [FacetA_version1, FacetB_version1, FacetC_version1]<br/>
-   * Set2 = [FacetA_version2, FacetB_version1, FacetC_version1]<br/>
-   * Set3 = [FacetA_version1, FacetB_version1, FacetC_version2]<br/>
-   * Set4 = [FacetA_version2, FacetB_version1, FacetC_version2]<br/>
-   * <br/>
-   * @param arrayOfProjectFacetVersionArrays a two dimensional array containing elements 
-   * of type {@link IProjectFacetVersion}
-   * @param returnValidOnly false if all combinations of facet versions are to be returned. 
-   * true if only valid combinations of facet versions are to be returned.  
-   * @return Set[] an array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}. 
-   */
-  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);
-		try {
-			if( ProjectFacetsManager.check( new HashSet(), actions ).getSeverity() == IStatus.OK )        
-	        {
-	          allCombinations.add((combination));
-	        }
-		} catch (Throwable e) {
-			// Do nothing if ProjectFacetsManager.check() throws exception.
-			// TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status 
-			// 		would not be returned when an exception is thrown.
-		}     
-      }
-      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;    
-  }
-  
-  /**
-   * Returns a set of facet versions given a template. The highest facet version of every fixed 
-   * facet in the template is returned, with the exception of the jst.java facet, where the 1.4 
-   * facet version is returned.
-   * 
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return Set containing elements of type {@link IProjectFacetVersion}
-   */
-  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;
-  }
-  
-  /**
-   * Returns a set of facet versions given a template. The default facet version of every fixed 
-   * facet in the template is returned.  If unable to get default versions, an empty set will be returned.
-   * 
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return Set containing elements of type {@link IProjectFacetVersion}
-   */
-  public static Set getDefaultFacetVersionsFromTemplate(String templateId)
-  {
-	  HashSet defaultSet = new HashSet(); 
-	  try {
-		  IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-		  Set fixedFacets = template.getFixedProjectFacets(); 
-		  for (Iterator itr2 = fixedFacets.iterator(); itr2.hasNext(); ) 
-		  { 
-			  IProjectFacet facet = (IProjectFacet) itr2.next(); 
-			  IProjectFacetVersion defaultFacetVersion = null;
-			  defaultFacetVersion = facet.getDefaultVersion();
-			  defaultSet.add(defaultFacetVersion); 
-		  }             
-		  return defaultSet;
-	  } catch (IllegalArgumentException e) {
-		  return defaultSet;
-	  } catch (VersionFormatException e) {
-		  return defaultSet;
-	  } 
-	  
-  }
-  
-  /**
-   * Returns the template lables corresponding to the provided templateIds.
-   * @param templateIds array of valid template ids. Each id must correspond to a {@link IFacetedProjectTemplate}.
-   * @return String[] array of template labels.
-   */
-  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;
-    
-  }
-  
-  /**
-   * Returns the id of a template given its label. 
-   * 
-   * @param templateLabel label of a template
-   * @return template id or empty String if no {@link IFacetedProjectTemplate} with the
-   * given templateLabel could be found.
-   */
-  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 "";
-  }
-  
-  /**
-   * Returns the label of a template given its id 
-   * 
-   * @param templateId id of a {@link IFacetedProjectTemplate}
-   * @return template label
-   */  
-  public static String getTemplateLabelById(String templateId)
-  {
-    IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId);
-    return template.getLabel();
-  }
-  
-  /**
-   * Returns a set of install actions for the provided facet version
-   * 
-   * @param projectFacetVersions Set containing elements of type {@link IProjectFacetVersion}
-   * @return Set containing elements of type {@link Action} with the type attribute set to Type.INSTALL
-   * The set contains one Action for each {@link IProjectFacetVersion} in projectFacetVersions.
-   */
-  public static Set getInstallActions(Set projectFacetVersions)
-  {
-    HashSet actions = new HashSet();
-    
-    Iterator facets = projectFacetVersions.iterator();
-    
-    while(facets.hasNext())
-    {
-    	IProjectFacetVersion fv = (IProjectFacetVersion)facets.next();
-    	if (fv != null) {
-    		IProjectFacet pf = fv.getProjectFacet();
-    		Action action = new Action(Type.INSTALL, fv, getConfigObject(pf));
-    		actions.add(action);
-    	}
-    }
-    
-    return actions;
-  }
-  
-  /**
-   * Returns the data model config object for the given project facet
-   * For J2EE facets, set Add_TO_EAR properties of the data model to false, 
-   * for other facets, just return null
-   * @param facetID
-   * @return data model config object
-   */
-  public static Object getConfigObject(IProjectFacet projectFacet)
-  {
-	  
-	  IDataModel dm = null;
-	  if (projectFacet != null) {
-		  String facetId = projectFacet.getId();
-		  if (facetId != null) {
-			  // set Add to EAR to false
-			  if (facetId.equals(IModuleConstants.JST_WEB_MODULE)) { 
-				  dm = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
-				  dm.setBooleanProperty(IWebFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			  } else if (facetId.equals(IModuleConstants.JST_EJB_MODULE)) {
-				  dm = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
-				  dm.setBooleanProperty(IEjbFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			  } else if (facetId.equals(IModuleConstants.JST_APPCLIENT_MODULE)) {
-				  dm = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
-				  dm.setBooleanProperty(IAppClientFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			  } else if (facetId.equals(IModuleConstants.JST_UTILITY_MODULE)) {
-				  dm = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
-				  dm.setBooleanProperty(IUtilityFacetInstallDataModelProperties.ADD_TO_EAR, false);
-			  }
-		  }
-	  }
-	  return dm;
-  }
-  /**
-   * Returns the {@link FacetMatcher} calculated when checking the required facet versions 
-   * against the facet versions.
-   * 
-   * @param requiredFacetVersions array of required facet versions
-   * @param projectFacetVersions facet versions to check against. Set containing elements of type 
-   * {@link IProjectFacetVersion}
-   * @return FacetMatcher with the following characteristics:
-   * <ul>
-   * <li><b>isMatch</b>: returns true if the required facet versions already exist in the facet versions
-   * or can be added to the facet versions. isMatch will return false otherwise.</li>
-   * <li><b>getFacetsTested</b>: returns the same set of facet versions as the input parameter, projectFacetVersions</li>
-   * <li><b>getFacetsThatMatched</b>: if isMatch returns false, getFacetsThatMatched returns null. If isMatch returns true, 
-   * getFacetsThatMatched returns the subset of facet versions in the input parameter, projectFacetVersions, 
-   * that matched one of the required facet versions. This may be an empty set.</li>
-   * <li><b>getFacetsToAdd</b>: if isMatch returns false, getFacetsToAdd returns null. If isMatch returns true, 
-   * getFacetsToAdd returns the subset of facet versions that would need to be added to the facet versions in
-   * projectFacetVersions in order to satisfy the requirements of the required facet versions. This may be
-   * an empty set.</li>
-   * </ul>
-   */
-  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]);
-        try {
-			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;
-			}
-		} catch (Throwable e) {
-			// Do nothing if ProjectFacetsManager.check() throws exception.
-			// TODO This try/catch will be unneccesary once WTP bug 137551 is fixed so that an OK Status 
-			// 		would not be returned when an exception is thrown.
-		}                
-      }
-      
-      
-      if (!facetsCanBeAdded)
-      {
-        fm.setMatch(false);
-      }      
-    }
-    else
-    {
-      //There are no facets to add.
-      fm.setMatch(true);
-      fm.setFacetsThatMatched(facetsThatMatched);
-      fm.setFacetsToAdd(facetsToAdd);
-    }
-    
-    return fm;
-  }
-    
-  /**
-   * Adds facet versions to the provided project if required based on checking provided 
-   * required facet versions against the facet versions already installed on project.
-   * 
-   * @param project IProject which exists in the workspace
-   * @param rfvs array of required facet versions.
-   * @param monitor progress monitor
-   * @return IStatus with severity IStatus.ERROR
-   * <ul>
-   * <li>if the project does not exist or</li>
-   * <li>if the project is not open or</li>
-   * <li>an attempt to add facet versions to the project resulted in an error.</li>
-   * </ul> 
-   * Otherwise, returns an IStatus with severity IStatus.OK    
-   */
-  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;
-            }
-
-            status = addFacetsToProject(fProject, facetsToAdd);
-          }
-        }            
-      }
-    } 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
-      { 
-        status = getErrorStatusForAddingFacets(project.getName(), facetsToAdd, ce);
-      }
-    }
-    
-    return status;
-  }
-  
-
-  /**
-   * Adds the provided set of facet versions to the provided faceted project
-   * 
-   * @param fproject A faceted project which exists in the workspace
-   * @param projectFacetVersions A set containing elements of type {@link IProjectFacetVersion}
-   * @return An IStatus with a severity of IStatus.OK if the facet 
-   * versions were added successfully. Otherwise, an IStatus with a severity of
-   * IStatus.ERROR. 
-   */
-  public static IStatus addFacetsToProject(final IFacetedProject fproject, final Set projectFacetVersions)
-  {
-    final IStatus[] status = new IStatus[1];
-    status[0] = Status.OK_STATUS;
-    final Set actions = getInstallActions(projectFacetVersions);
-    
-    // Create a runnable that applies the install actions to the faceted project
-    IRunnableWithProgress runnable = new IRunnableWithProgress()
-    {
-      public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-      {
-        try
-        {
-          fproject.modify(actions, shellMonitor);
-		  fixEJBClassPath(fproject);
-        } catch (CoreException e)
-        {
-          status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
-        }
-      }
-    };    
-        
-    // Run the runnable in another thread unless there is no UI thread (Ant scenarios)    
-    if (displayPresent())
-    {    	
-	    try
-	    {
-	      PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
-	    } catch (InvocationTargetException ite)
-	    {
-	      status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ite);
-	    } catch (InterruptedException ie)
-	    {
-	      status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, ie);
-	    }
-	}
-	else
-	{
-		try
-        {
-          fproject.modify(actions, null);
-		  fixEJBClassPath(fproject);
-        } catch (CoreException e)
-        {
-          status[0] = getErrorStatusForAddingFacets(fproject.getProject().getName(), projectFacetVersions, e);
-        }
-	}
-    
-    return status[0];
-  }
-  
-  protected static void fixEJBClassPath(IFacetedProject project) {
-			if (!J2EEUtils.isEJBComponent(project.getProject())) return;
-			IProject ejbProject = project.getProject();
-			IJavaProject javaProject = JavaCore.create(ejbProject);
-			Path projectRoot = new Path(Path.ROOT.append(new Path(ejbProject.getName())).toString());
-			IPath ejbModulePath = projectRoot.append("ejbModule");
-			try {
-				IClasspathEntry[] originalSet = javaProject.getRawClasspath();
-				boolean foundEJBModulEntry = false;
-				for (int i = 0; i < originalSet.length ; i++) {
-					if (originalSet[i].equals(ejbModulePath))
-						foundEJBModulEntry = true;
-				}
-				if (!foundEJBModulEntry) {
-					IClasspathEntry[] newSet = new IClasspathEntry[originalSet.length + 1];
-					for (int i = 0; i < originalSet.length ; i++) {
-						newSet[i] = originalSet[i];
-					}
-					newSet[originalSet.length] = JavaCore.newSourceEntry(ejbModulePath);
-					javaProject.setRawClasspath(newSet,null);
-				}
-			}
-			catch (Exception e) {
-				// TODO: handle exception
-			}  		
-
-		}
-
-/**
-   * Returns an error status indicating that the facet versions could not be
-   * added to the faceted project
-   * 
-   * @param projectName a project name to insert in the error message in the IStatus
-   * @param projectFacetVersions a set containing elements of type {@link IProjectFacetVersion}.
-   * The facets in this set will be listed in the error message in the IStatus.
-   * @param t a Throwable which will be inserted in the IStatus
-   * @return an IStatus with severity IStatus.ERROR
-   */
-  private static IStatus getErrorStatusForAddingFacets(String projectName, Set projectFacetVersions, Throwable t)
-  {
-    IStatus status = Status.OK_STATUS;
-    int size = projectFacetVersions.size();
-    if (size > 0)
-    {          
-      Set facets = new HashSet();
-      //Iterate over projectFacetVersions to form a set of IProjectFacets
-      Iterator itr = projectFacetVersions.iterator();
-      while (itr.hasNext())
-      {
-        IProjectFacetVersion projectFacet = (IProjectFacetVersion)itr.next();
-        IProjectFacet facet = projectFacet.getProjectFacet();
-        facets.add(facet);
-      }
-      String facetList = getFacetListMessageString(facets);
-      status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_ADDING_FACETS_TO_PROJECT, new String[] { projectName, facetList}), t);
-    }
-    
-    return status;
-  }
-  
-  /**
-   * Creates a new faceted project with the provided name
-   * 
-   * @param projectName A String containing the name of the project to be created
-   * @return An IStatus with a severity of IStatus.OK if the faceted project
-   * was created successfully or if a project of the provided name already
-   * exists in the workspace. Otherwise, an IStatus with severity of
-   * IStatus.ERROR. 
-   */
-  public static IStatus createNewFacetedProject(final String projectName)
-  {
-    final IStatus[] status = new IStatus[1];
-    status[0] = Status.OK_STATUS;
-    IProject project = ProjectUtilities.getProject(projectName);
-    if (!project.exists())
-    {
-      // Create a runnable that creates a new faceted project.
-      IRunnableWithProgress runnable = new IRunnableWithProgress()
-      {
-        public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-        {
-          try
-          {
-            IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, shellMonitor);
-            if (fProject == null)
-            {
-              status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
-            }
-          } catch (CoreException e)
-          {
-            status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
-          }
-        }
-      };
-
-    // Run the runnable in another thread unless there is no UI thread (Ant scenarios)    	  
-      try
-      {
-    	  if (displayPresent())
-    	  {
-    		  PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);    		  
-    	  }
-    	  else
-    	  {
-    		  try
-              {
-                IFacetedProject fProject = ProjectFacetsManager.create(projectName, null, null);
-                if (fProject == null)
-                {
-                  status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }));
-                }
-              } catch (CoreException e)
-              {
-                status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), e);
-              }  
-    	  }        
-      } catch (InvocationTargetException ite)
-      {
-        status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ite);
-      } catch (InterruptedException ie)
-      {
-        status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName }), ie);
-      }
-    }
-
-    return status[0];
-  }
-  
-  /**
-   * Sets the provided set of facets as fixed on the faceted project
-   * 
-   * @param fProject A faceted project which exists in the workspace
-   * @param fixedFacets A set containing elements of type {@link IProjectFacet}
-   * @return An IStatus with a severity of IStatus.OK if the facets 
-   * were successfully set as fixed facets on the faceted project. 
-   * Otherwise, an IStatus with a severity of IStatus.ERROR.
-   * 
-   * @see IFacetedProject#setFixedProjectFacets
-   */
-  public static IStatus setFixedFacetsOnProject(final IFacetedProject fProject, final Set fixedFacets)
-  {
-    final IStatus[] status = new IStatus[1];
-    status[0] = Status.OK_STATUS;
-
-    //Create a runnable that sets the fixed facets on the faceted project
-    IRunnableWithProgress runnable = new IRunnableWithProgress()
-    {
-      public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-      {
-        try
-        {
-          fProject.setFixedProjectFacets(fixedFacets);
-        } catch (CoreException e)
-        {
-          status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
-        }
-      }
-    };
-
-    // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
-    if (displayPresent())
-    {
-    	try
-        {
-          PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
-        } catch (InvocationTargetException ite)
-        {
-          status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ite);
-        } catch (InterruptedException ie)
-        {
-          status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, ie);
-        }	
-    }
-    else
-    {
-    	try
-        {
-          fProject.setFixedProjectFacets(fixedFacets);
-        } catch (CoreException e)
-        {
-          status[0] = getErrorStatusForSettingFixedFacets(fProject.getProject().getName(), fixedFacets, e);
-        }
-    }       
-    
-    return status[0];
-  }
-  
-  /**
-   * Returns an error status indicating that the facets could not be
-   * set as fixed facets on the faceted project
-   * 
-   * @param projectName a project name to insert in the error message in the IStatus
-   * @param facets a set containing elements of type {@link IProjectFacet}.
-   * The facets in this set will be listed in the error message in the IStatus.
-   * @param t a Throwable which will be inserted in the IStatus
-   * @return an IStatus with severity IStatus.ERROR
-   */
-  private static IStatus getErrorStatusForSettingFixedFacets(String projectName, Set facets, Throwable t)
-  {
-    IStatus status = Status.OK_STATUS;
-    int size = facets.size();
-    if (size > 0)
-    {          
-      String facetList = getFacetListMessageString(facets);      
-      status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FIXED_FACETS, new String[] { projectName, facetList}), t);
-    }
-    
-    return status;
-  }  
-  
-  
-  /**
-   * Binds the faceted project to the facet runtime
-   * 
-   * @param fProject A faceted project which exists in the workspace
-   * @param fRuntime A facet runtime
-   * @return An IStatus with a severity of IStatus.OK if the faceted project
-   * was bound to the facet runtime successfully. Otherwise, an IStatus with severity of
-   * IStatus.ERROR. 
-   */
-  public static IStatus setFacetRuntimeOnProject(final IFacetedProject fProject, final IRuntime fRuntime)
-  {
-    final IStatus[] status = new IStatus[1];
-    status[0] = Status.OK_STATUS;
-
-    //Create a runnable that sets the facet runtime on the faceted project
-    IRunnableWithProgress runnable = new IRunnableWithProgress()
-    {
-      public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-      {
-        try
-        {
-        	fProject.setTargetedRuntimes(Collections.singleton(fRuntime), shellMonitor);
-        } catch (CoreException e)
-        {
-          status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
-        }
-      }
-    };
-
-    // Run the runnable in another thread unless there is no UI thread (Ant scenarios)
-    if (displayPresent())
-    {
-    	try
-        {
-          PlatformUI.getWorkbench().getProgressService().run(true, false, runnable);
-        } catch (InvocationTargetException ite)
-        {
-          status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ite);
-        } catch (InterruptedException ie)
-        {
-          status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), ie);
-        }	
-    }
-    else 
-    {
-    	try
-        {
-    		fProject.setTargetedRuntimes(Collections.singleton(fRuntime), null); //jvh - happens here...
-        } catch (CoreException e)
-        {
-          status[0] = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_SETTING_RUNTIME, new String[] { fProject.getProject().getName(), fRuntime.getName() }), e);
-        }
-    }
-        
-    
-    return status[0];
-  }
-  
-  /**
-   * Returns a translatable delimited list of facet labels derived from the provided
-   * set of facets
-   * 
-   * @param facets a set containing elements of type {@link IProjectFacet}
-   * @return String a delimited list of facet labels
-   */
-  private static String getFacetListMessageString(Set facets)
-  {
-    String facetListMessage = "";
-    int size = facets.size();
-    if (size > 0)
-    {
-      Iterator itr = facets.iterator();
-      IProjectFacet firstProjectFacet = (IProjectFacet)itr.next();
-      facetListMessage = firstProjectFacet.getLabel();
-      
-      //Continue appending to facetListMessage until all the facet labels
-      //are in the list.
-      while (itr.hasNext())
-      {
-        IProjectFacet projectFacet = (IProjectFacet)itr.next();
-        String pfLabel = projectFacet.getLabel();
-        facetListMessage = NLS.bind(ConsumptionMessages.MSG_FACETS, new String[] {facetListMessage, pfLabel});
-      }            
-    }    
-    
-    return facetListMessage;
-  }
-  
-  
-  /**
-   * Returns the set of facet versions which can be inferred from the provided Java project
-   * 
-   * @param javaProject a Java project that exists in the workspace. Must not be null.
-   * @return Set containing elements of type {@link IProjectFacetVersion}
-   */
-  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 = JavaCore.getOption(JavaCore.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 if (jdkComplianceLevel.equals("1.6"))
-    {
-      javaFacetVersion = javaFacet.getVersion("6.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.
-  
-  /**
-   * Returns a set of facet runtimes that support the given
-   * required facet versions.
-   * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
-   * @return Set set of facet runtimes that support the given required facet versions.
-   * (element type: {@link IRuntime}) 
-   */
-  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]));
-    
-  }  
-  
-  /**
-   * Returns whether or not the provided facet runtime supports the provided
-   * required facet versions.
-   * 
-   * @param requiredFacetVersions an array containing elements of type {@link RequiredFacetVersion}
-   * @param fRuntimeName name of a {@link IRuntime}
-   * @return boolean <code>true</code> if the facet runtime supports the required facet versions.
-   * Returns <code>false</code> otherwise.
-   */
-  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;
-  }
-    
-  /**
-   * Returns the union of facet runtimes that support the provided sets of facet versions.
-   * 
-   * @param facetSets array of Sets, where each Set contains elements of type {@link IProjectFacetVersion}.
-   * @return Set containing elements of type {@link IRuntime}
-   */
-  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;
-  }
-  
-  /**
-   * Returns whether or not the provided facet runtime supports the provided set of facet versions.
-   * 
-   * @param facetRuntime a facet runtime
-   * @param projectFacetVersions set containing elements of type {@link IProjectFacetVersion}
-   * @return boolean <code>true</code> if the facet runtime supports the provided set of facet versions.
-   * Returns <code>false</code> otherwise.
-   */
-  public static boolean doesRuntimeSupportFacets(IRuntime facetRuntime, Set projectFacetVersions)
-  {
-  	if ( facetRuntime == null || projectFacetVersions == null)
-  		return false;
-  	
-    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;
-  }
-  
-  /**
-   * Returns whether versionA is greater than versionB
-   * 
-   * @param versionA version number of the form 1.2.3
-   * @param versionA version number of the form 1.2.3
-   * @return boolean <code>true</code> if versionA is greater than versionB, <code>false</code> otherwise.
-   */
-  public static boolean greaterThan(String versionA, String versionB)
-  {
-  	if (versionA == null || versionB == null)
-  		return false;
-  	
-    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;
-  }
-  
-  /**
-   * Returns whether the provided facet has an id of "jst.java"
-   * @param pf facet
-   * @return <code>true</code> if facet has an id of "jst.java", <code>false</code> otherwise.
-   */
-  public static boolean isJavaFacet(IProjectFacet pf)
-  {
-    if (pf != null && pf.getId().equals("jst.java"))
-      return true;
-    else
-      return false;
-  }
-  
-  /**
-   * Returns whether or not the provided project is a faceted Java utility project or a non-faceted Java project.
-   * 
-   * @param project an IProject
-   * @return boolean <code>true</code> if the provided project is a faceted Java utility project 
-   * or a non-faceted Java project, <code>false</code> otherwise.
-   */
-  public static boolean isJavaProject(IProject project)
-  {
-	  if (project == null)
-	    return false;
-	  
-    //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
-      {
-        if (ResourceUtils.isJavaProject(project))
-        {
-          return true;
-        }        
-      }
-    } catch (CoreException ce)
-    {
-      
-    }
-
-    return false;
-  }
-  
-  /**
-   * Returns whether or not the provided template id is equal to "template.jst.utility"
-   * 
-   * @param templateId template id
-   * @return boolean <code>true</code> if the provided template id is equal to "template.jst.utility", 
-   * <code>false</code> otherwise.
-   */
-  public static boolean isUtilityTemplate(String templateId)
-  {
-    if (templateId != null && ProjectFacetsManager.isTemplateDefined(templateId))
-    {
-      if (templateId.equals("template.jst.utility"))
-      {
-        return true;
-      }
-    }
-    
-    return false;
-  }
-      
-  	/**
-  	 * Returns the required facet version of a EAR that should contain the given project. 
-  	 * 
-  	 * @param project The project
-  	 * @return An array of required facet versions.  If no constraints can be inferred from the
-  	 * project, an empty array is returned.
-  	 */
-	public static RequiredFacetVersion[] getRequiredEARFacetVersions(IProject project) {
-  		
-		int version = 0;
-  		
-  		if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
-  			
-  			version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(
-  					J2EEProjectUtilities.getJ2EEProjectVersion(project));
-  		}
-  		else if (JavaEEProjectUtilities.isEJBProject(project)) {
-  			
-  			version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(
-  					J2EEProjectUtilities.getJ2EEProjectVersion(project));
-  		}
-  		else if (JavaEEProjectUtilities.isApplicationClientProject(project)) {
-  			
-  			version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(
-  					J2EEProjectUtilities.getJ2EEProjectVersion(project));
-  		}
-  		else
-  			// return empty array, no constraints
-  			return new RequiredFacetVersion[0];
-	  
-  		IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
-  		IProjectFacetVersion projectFacetVersion = projectFacet.getVersion(J2EEVersionUtil.convertVersionIntToString(version));
-
-  		RequiredFacetVersion[] rfv = new RequiredFacetVersion[1];
-  		rfv[0] = new RequiredFacetVersion();
-  		rfv[0].setAllowNewer(false);	  
-  		rfv[0].setProjectFacetVersion(projectFacetVersion);
-  		
-  		return rfv;
-  	}
-	
-	// Check to see if SWT is active and the Display is present or not
-	private static boolean displayPresent() {
-		Bundle b = Platform.getBundle("org.eclipse.swt");
-	    if (b==null) {
-	    	return false;
-	    }
-	    if ((b.getState() != Bundle.RESOLVED && b.getState() != Bundle.ACTIVE) ) {
-	    	return false;
-	    }
-	    try {
-	    	if (Display.getCurrent() == null) {
-	    		return false;
-	    	} else {
-	    		return true;
-	    	}
-	    } catch (NoClassDefFoundError e1) {
-	    	return false;
-	    } catch (Exception e) {  // if the Display class cannot be loaded for whatever reason
-	    	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 cbec831..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 fc1f1d9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm. 
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)  
- */
-public interface IServerDefaulter
-{
-  
-  /**
-   * @param project
-   * @return ServerInfo. 
-   * If no existing server or server type is recommended, return null.
-   * If a server type is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and null for the serverInstanceId.
-   * If a server instance is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and the serverInstanceId.
-   */
-  public ServerInfo recommendDefaultServer(IProject project);
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
deleted file mode 100644
index 13493b8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaMerger.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
- * 20080122   215048 kathy@ca.ibm.com - Kathy Chan
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-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.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages;
-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.command.internal.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.Merger;
-import org.osgi.framework.Bundle;
-
-/*
- * JavaMerger handles the merging of workspace files using JMerger.  If the URIs specified is not a file
- * in the workspace, it will be ignored.
- */
-public class JavaMerger extends Merger implements IMerger {
-
-	private static final String WST_WS = "org.eclipse.wst.ws";
-	private static final String MERGE_XML = "merge.xml";
-	private static final String JMERGER = "jmerger";
-	
-	private int size = 0; 
-	private IFile[] workspaceFiles;
-	private JMerger[] mergeModels;
-	private JControlModel jMergeControlModel = null;
-	private IStatus loadStatus;
-	
-	
-	/*
-	 * Convert the URI strings in the uris array to Eclipse IFiles and store in the workspaceFiles array. 
-	 * Load the workspaceFiles into JMerger and store in the mergerModels array.  
-	 * If the merger model cannot be obtained, null is stored in the mergerModels. 
-	 * @see org.eclipse.wst.ws.internal.wsrt.IMerger#load(java.lang.String[])
-	 */
-	
-	public IStatus load(IFile[] files) {
-		
-		loadStatus = Status.OK_STATUS;
-		if (files != null) {
-			workspaceFiles = files;
-			PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
-			if (mergeContext.isSkeletonMergeEnabled()) {
-				// initialize JMerger
-				initialize();
-				
-				if (jMergeControlModel != null) {
-					// JMerger initialized properly
-					size = files.length;
-					mergeModels = new JMerger[size];
-					
-					for (int i = 0; i < size; i++) {
-						JMerger jMerger = null;
-						IFile file = null;
-						InputStream inStream = null;
-						
-						file = files[i];
-						if (file != null && file.exists()) {														
-							try {
-								inStream = file.getContents();
-								if (inStream != null) {
-									jMerger = new JMerger(jMergeControlModel);
-									jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
-								}
-							} catch (CoreException e) {
-								loadStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE_LOAD, file), e);
-							} finally {
-								if (inStream != null) {
-									try {
-										inStream.close();
-									} catch (IOException e) {
-										// ignore exceptions in closing file
-									}
-								}
-							}				
-						}
-						mergeModels[i] = jMerger;
-					}
-				}
-			}
-		}
-		return loadStatus;
-	}
-
-	/**
-	 * Initializes the JMerge model
-	 * File merge.xml in WebServicePlugin contains the rules for the merge.
-	 * If the merge.xml file is not found, jMergeControlModel is leave as null.
-	 */
-	private void initialize() {
-		if (jMergeControlModel == null) {
-			FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
-			jMergeControlModel = new JControlModel();
-
-			Bundle        wsBundle = Platform.getBundle(WST_WS);
-			IPath         mergePath      = new Path( JMERGER ).append( MERGE_XML );
-			URL           fileURL        = FileLocator.find( wsBundle, mergePath, null);
-			jMergeControlModel.initialize(facadeHelper, fileURL.toString());
-		}
-		return;
-	}
-	
-	/**
-	 * Merge the current contents of the workspaceFiles with the mergeModels that had been stored earlier.   
-	 * Then write the merged contents back to the file.
-	 * @param monitor
-	 * @param statusHandler
-	 * @return IStatus
-	 */
-	public IStatus merge(IProgressMonitor monitor, IStatusHandler statusHandler) {
-		
-		IStatus status = Status.OK_STATUS;
-		
-		if (loadStatus != null && loadStatus.getSeverity() == IStatus.ERROR) {
-			return loadStatus;
-		}
-		
-		PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
-		if (mergeContext.isSkeletonMergeEnabled()) {
-			ResourceContext resourceContext = new TransientResourceContext();
-			resourceContext.setCheckoutFilesEnabled(true);
-			resourceContext.setCreateFoldersEnabled(true);
-			resourceContext.setOverwriteFilesEnabled(true);
-			for (int i = 0; i < size; i++) {
-				String mergedContent = null;
-				JMerger jMerger = null;
-				IFile file = null;
-				InputStream inStream = null;
-				byte[] buf = null;
-				
-				jMerger = mergeModels[i];
-				file = workspaceFiles[i];
-				if (file != null && jMerger != null && file.exists()) {  
-					// a JMerger model of the file exists, merge the contents
-					try {
-						inStream = file.getContents();
-						jMerger.setSourceCompilationUnit(jMerger.createCompilationUnitForInputStream(inStream));
-						jMerger.merge();
-						mergedContent = jMerger.getTargetCompilationUnitContents();	
-						if (mergedContent != null) {
-							try {
-								buf = mergedContent.getBytes(file.getCharset());
-							} catch (UnsupportedEncodingException e) {
-								buf = mergedContent.getBytes();
-							}
-							inStream = new ByteArrayInputStream(buf);
-							IPath targetPath = file.getLocation();
-							if (targetPath != null) {
-								FileResourceUtils.createFileAtLocation(resourceContext, targetPath.makeAbsolute(), inStream,
-									  monitor, statusHandler);
-							}
-						}
-					} catch (CoreException e) {
-						status = StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_FILE_MERGE, file), e);
-					} finally {
-						try {
-							if (inStream != null) {
-								inStream.close();
-							}
-						} catch (IOException e) {
-							// ignore exceptions in closing file
-						}
-					}
-				}
-			}
-			
-		}
-		return status;
-	}
-	
-}
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 a84da23..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 13648de..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 bd679f1..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 08d2aa9..0000000
--- 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, 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          
- *******************************************************************************/
-
-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/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
-  String serverFactoryId;
-  String serverInstanceId;
-  /**
-   * @return Returns the serverFactoryId.
-   */
-  public String getServerFactoryId()
-  {
-    return serverFactoryId;
-  }
-  /**
-   * @param serverFactoryId The serverFactoryId to set.
-   */
-  public void setServerFactoryId(String serverFactoryId)
-  {
-    this.serverFactoryId = serverFactoryId;
-  }
-  /**
-   * @return Returns the serverInstanceId.
-   */
-  public String getServerInstanceId()
-  {
-    return serverInstanceId;
-  }
-  /**
-   * @param serverInstanceId The serverInstanceId to set.
-   */
-  public void setServerInstanceId(String serverInstanceId)
-  {
-    this.serverInstanceId = serverInstanceId;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a6dd181..0000000
--- 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 33d3726..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 8b05856..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 03db954..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 a125104..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071122   210692 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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 + "String temp"+ getUniqueName() + " = null;" + StringUtils.NEWLINE
-    				 + Generator.DOUBLE_TAB + "if(" + name + " != null){" + StringUtils.NEWLINE
-    				 + Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE 
-    	             + Generator.DOUBLE_TAB + "}" + 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 137cf71..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNING_BEAN = "owningbean";
-
-  private String fSetterMethod;
-  private String fGetterMethod;
-
-  /**
-  * Constructor this takes the owning bean.
-  * @param name The name of the attribute.
-  * @param beanElement the bean that owns this attribute.
-  */
-  public AttributeElement ( BeanElement beanElement, String name)
-  {
-    super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
-  }
-  
-  public void setSetterMethod(String setterMethod)
-  {
-    fSetterMethod = setterMethod;
-  }
-
-  public String getSetterMethod()
-  {
-    return fSetterMethod;
-  }
-
-  public String getGetterMethod()
-  {
-    return fGetterMethod;
-  }
- 
-  public void setGetterMethod(String getterMethod)
-  {
-    fGetterMethod = getterMethod;
-  }
-
-  public String getSetterSignature(String attribute)
-  {
-    int bracket = fSetterMethod.indexOf("(");
-    bracket++;
-    String setter = fSetterMethod.substring(0,bracket);
-    String fullSetter = setter + attribute + ");";
-   
-    return fullSetter;
-  }
-
-  /**
-  * Returns the Bean that owns this Attribute.
-  * @return BeanElement The bean that owns this attribute.
-  */
-  public BeanElement getOwningBeanElement ()
-  {
-    Enumeration e = getElements(REL_OWNING_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the type that is owned by this attributte.
-  * @return TypeElement The Type that of this attribute.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public void setSetterMethod(String setterMethod);
-  public String getSetterMethod();
-  public String getGetterMethod();
-  public void setGetterMethod(String getterMethod);
-  public BeanElement getOwningBeanElement ();
-  public TypeElement getTypeElement ();
-  /**
-  * Return the signature with this value as the parmeter
-  *
-  */
-  public String getSetterSignature(String attribute);
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index 79c9d0d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,147 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612   145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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";
-  public static int READONLY = 0;
-  public static int WRITEONLY = 1;
-  public static int READWRITE = 2;
-  private int attrib = 2;
-  
-  
-  /**
-  * 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;
-    attribFunction(attributeElement);
-  }
- 
-  private void attribFunction(AttributeElement attributeElement){
-	if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() != null) attrib = READWRITE;
-	else if(attributeElement.getGetterMethod() == null && attributeElement.getSetterMethod() != null) attrib = WRITEONLY;
-	else if(attributeElement.getGetterMethod() != null && attributeElement.getSetterMethod() == null) attrib = READONLY;
-  }
-  
-   /**
-  * 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 int getAttrib()
-  {
-    return attrib;
-  }
-  
-  public void setAttrib(int attrib)
-  {
-    this.attrib = attrib;
-  }
-  
-  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 174d6af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static final String RETURN_PARAM_NAME="returnp";
-
-  private BeanModelElementsFactory(){}
-
-  public static Element getBeanModelElement(Object object)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,null,null);
-  }
-
-  public static Element getBeanModelElement(Object object,Element parentElement)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
-  }
-  
- /*
-  * Take in an object and return an element depending on what 
-  * type we are dealing with from the javamof
-  **/
-  public static Element getBeanModelElement(Object object,Element parentElement, Model model)
-  {
-    Element returnElement = null;
-
-    if (object instanceof JavaClass){
-      JavaClass javaClass = (JavaClass)object;
-      String javaName = javaClass.getJavaName();
-      if (!javaClass.isArray()){ 
-	      if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-            }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }	         
-	      }
-      } 
-      else{
-          if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }
-
-	      }
-       }
-
-    }
-    else if(object instanceof SamplePropertyDescriptor){
-      SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
-      returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());  
-    }
-    else if(object instanceof Field){
-      Field field = (Field)object;
-      returnElement = new FieldElement((BeanElement)parentElement,field.getName());
-    }
-    else if (object instanceof Method){
-      Method method = (Method)object;
-      returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
-    }
-    //non beaninfo
-    else if (object instanceof String){
-      String name = (String)object;  
-      returnElement = new AttributeElement((BeanElement)parentElement,name);
-    }
-    else if (object instanceof JavaParameter){
-      JavaParameter javaParameter = (JavaParameter)object;
-
-      
-      if (javaParameter.isReturn()) 
-         returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true); 
-      else{ 
-         //a java parameter gives us the qualified name we dont want this
-         String name = javaParameter.getQualifiedName();
-         String shortName;
-         int index = name.lastIndexOf(".");
-         if (index != -1){
-           index++;
-           shortName = name.substring(index);
-         }
-      else shortName = name;
-
-         returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false); 
-
-      }
-     
-    }
-    else if (object instanceof JavaHelpers){
-      JavaHelpers javaHelper = (JavaHelpers)object;
-      String javaName; 
-      if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
-      else javaName = javaHelper.getJavaName();
-      if (parentElement instanceof ParameterElement){
-          returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof AttributeElement){
-          returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof FieldElement){
-          returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof MethodElement){
-      	returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-      }
-    }
-    return returnElement;
-  }
-  
-  
-  
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigDecimalType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigDecimalType()
-  {
-    super(TypeFactory.BIG_DECIMAL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigDecimal(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigIntegerType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigIntegerType()
-  {
-    super(TypeFactory.BIG_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigInteger(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a69..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task 
-* by creating a datatype and calling generic methods that are 
-* to be specialized in subclasses
-*/
-public interface DataType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public static String REL_TYPE = "type";
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName);
-
-  /**
-  * Often times in order to convert a type to string, string to type or just plain provide an input form
-  * A temporary variable is used. If we run into a sitution where two of the same types are used in the  
-  * same method these temporary variables share the same name space. It isnt enough to use a name 
-  * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
-  * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
-  * DataType to insure it is unique.
-  * @return Unique Name 
-  */
-  public void setUniqueName(String name);
-
-  /**
-  * This is the name each temp variable will use
-  * 
-  *
-  */
-  public String getUniqueName();
-  
-  /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id);
-
-
-  /**
-  * Input form returns the user input html
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name);
-  
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name);
-
-  /**
-  * return the type
-  * @return String the type(including package).
-  */
-  public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 95a9c44..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071110   209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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 + nodeName  +  "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"                         
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index c0406ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class DomElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public DomElementType()
-  {
-    fType = "org.w3c.dom.Element";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "org.w3c.dom.Element " + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion; 
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index 44fbb1d..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 3a9d9d1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071110   209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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 + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();" 
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public HashtableType()
-  {
-    super(TypeFactory.HASHTABLE_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class MapType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public MapType()
-  {
-    super(TypeFactory.MAP_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index 271e4ed..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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/ObjectType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
deleted file mode 100644
index deebdff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ObjectType.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20060823	  145643 mahutch@ca.ibm.com - Mark Hutchinson (created class)
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class ObjectType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public ObjectType()
-  {
-    super(TypeFactory.OBJECT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  { 
-	//We can't deserialize a String to an Object
-	//this should never actually be called since
-	//methods with Objects as input are omitted.
-    return "new java.lang.Object();";
-  }
-
-  /**
-  * 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/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 901cfc3..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_METHOD = "method";
-  public static final String REL_TYPE = "type";
-
-  public boolean fReturnParameter=false;
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
-  {
-    this(name,methodElement,REL_METHOD,relType);
-    fReturnParameter = returnParameter;
-  }
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
-  {
-    super(name,methodElement,outRel,inRel);
-  }
-   
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public MethodElement getMethodElement ()
-  {
-    Enumeration e = getElements(REL_METHOD);
-    return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-
-  public boolean isReturn()
-  {
-    return fReturnParameter;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 3873061..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveArrayType(String typeName)
-  {
-    super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
-  }
-
-   /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
-    String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";" 
-    	             + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name 
-    	                   + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE  
-    	             + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName() 
-    	                   + "] + \",\";" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();" 
-                           + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";" 
-                           + StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
-    return nonBean;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveBooleanType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveBooleanType()
-  {
-    super(TypeFactory.PRIM_BOOLEAN_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveByteType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveByteType()
-  {
-    super(TypeFactory.PRIM_BYTE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Byte.parseByte(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f903..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveCharType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveCharType()
-  {
-    super(TypeFactory.PRIM_CHAR_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "" + name + ".charAt(0);";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveDoubleType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveDoubleType()
-  {
-    super(TypeFactory.PRIM_DOUBLE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Double.parseDouble(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveFloatType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveFloatType()
-  {
-    super(TypeFactory.PRIM_FLOAT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Float.parseFloat(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveIntType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveIntType()
-  {
-    super(TypeFactory.PRIM_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Integer.parseInt(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f715236..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveJavaTypes extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveJavaTypes(String type)
-  {
-    super(type);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = fType + ".valueOf(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c826..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveLongType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveLongType()
-  {
-    super(TypeFactory.PRIM_LONG_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Long.parseLong(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveShortType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveShortType()
-  {
-    super(TypeFactory.PRIM_SHORT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Short.parseShort(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 43106b8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071110   209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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 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 stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName 
-     	                 + Generator.SPACE + " = " + StringToType(attributeName) 
-     	                 + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-  
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
-  
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class RecognizedReturnType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public RecognizedReturnType(String type)
-  {
-    fType = type;
-    fUniqueName = "";
-  }
-
-  /**
-  * not relevant at this point 
-  */
-  public String inputForm(String name)
-  {
-     return "";
-  }
-
-   /**
-  * again not relevant
-  */
-  public String getRequestCode(String name, String id)
-  {
-     return "";
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-    return "";
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String nonBean =   Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE   
-    	             + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB +  "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB +  "<%" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "}";
-    return nonBean;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 289e009..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class SOAPElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public SOAPElementType()
-  {
-    fType = "javax.xml.soap.SOAPElement";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "javax.xml.soap.SOAPElement " + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives 
-*/
-public class SimpleElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Parameter that owns this simple type.
-  * @param String Name of the simple element.
-  */
-  public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-    setPrimitive(prim);
-  }
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-    setPrimitive(prim);
-  }
-
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.FIELD_OWNER;
-    setPrimitive(prim);
-  }
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index 116ede9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20071110   209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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 + 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 40f9d6c..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 1b99c74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class StringType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public StringType()
-  {
-    super(TypeFactory.STRING_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = name + ";";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index af80d7f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070410   180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- *******************************************************************************/
-
-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 final String NON_INSTANTIABLE = "nonInstantiable";
-
-  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 7bed616..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,263 +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
- * -------- -------- -----------------------------------------------------------
- * 20060726   145676 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060823	  145643 mahutch@ca.ibm.com - Mark Hutchinson
- *******************************************************************************/
-
-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 OBJECT_NAME			   = "java.lang.Object";
-  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(OBJECT_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
-	//java.lang.Objects are ok for return types but not for input type
-    if (javaHelpers.isArray()||
-    		javaHelpers.getJavaName().equals(MAP_NAME)||
-    		javaHelpers.getJavaName().equals(VECTOR_NAME)||
-    		javaHelpers.getJavaName().equals(DATA_HANDLER)||
-    		javaHelpers.getJavaName().equals(OBJECT_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 String DATA_HANDLER = "javax.activation.DataHandler";
-
-  public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-	//java.lang.Objects are ok for return types
-    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 if (javaHelpers.getJavaName().equals(OBJECT_NAME))return true;
-    else return false;
-  }
-
-  public static boolean isRecognizedReturnType(String type)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-	//java.lang.Objects are ok for return types
-    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 if (type.equals(OBJECT_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();
-    else if (type.equals(OBJECT_NAME))				datatype = new ObjectType();
-
-    // need to see if it is an object array
-    //or a primitive
-    else if (type.startsWith(ARRAY_NAME)){              
-    	String name = type.substring(21); 
-        if(name.startsWith(PRIM_BOOLEAN_NAME) ||
-          name.startsWith(PRIM_BYTE_NAME)     ||
-          name.startsWith(PRIM_DOUBLE_NAME)  ||
-          name.startsWith(PRIM_FLOAT_NAME)    ||
-          name.startsWith(PRIM_LONG_NAME)    ||
-          name.startsWith(PRIM_INTEGER_NAME)  ||
-          name.startsWith(PRIM_CHAR_NAME)    ||
-          name.startsWith(PRIM_SHORT_NAME))
-            datatype = new PrimitiveArrayType(name);  
-        else
-        	datatype = new ArrayType(name);
-
-    }
-    else if (stateless){
-        datatype = new StateLessBeanType(type);
-
-    }
-
-
-    datatype.setUniqueName(UniqueName);
-    return datatype;
-     
-  }
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class URLType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public URLType()
-  {
-    super(TypeFactory.URL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "new java.net.URL(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class VectorType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VectorType()
-  {
-    super(TypeFactory.VECTOR_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class VoidType extends SimpleType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VoidType()
-  {
-    super("void");
-  }
-
-   /**
-  * for a void there is no need to return 
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-  
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index bc0128e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 3ab1a2c..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 8454c22..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 dbe2781..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 2489c2e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 42400dc..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 06bda94..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 9ed1560..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 e591d7f..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 b28fa76..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 29b145f..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 f622aba..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 3b69fbc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 57fa1ed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 342a2b1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 77cef3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 8458f5c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 ccb4d2f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 c849245..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 3d4062a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,57 +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
- * -------- -------- -----------------------------------------------------------
- * 20060424   115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
-* 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
-{
-  /**
-  * 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_;
-  }
-
-}
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 1225e03..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,76 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612   145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-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.getSetterMethod() == null) return Status.OK_STATUS;
-     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 6d47bb0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 c46105f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 2b7e64b..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 9b9bf6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060612   145433 gilberta@ca.ibm.com - Gilbert Andrews
- * 20070410   180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes 
- *******************************************************************************/
-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;
-  private boolean fWrite = true;
-
-  /**
-  * 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 (Boolean.TRUE.equals(element.getPropertyAsObject(TypeElement.NON_INSTANTIABLE)))
-	    return Status.OK_STATUS;
-     
-     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;
-        if (bean.getAttrib() == BeanElement.READONLY) fWrite = false;
-     }
-
-
-
-     //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
-     if(fWrite){
-       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("")){
-           if(fWrite){
-             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 2f2e1a9..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 caec50e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 d5d0b75..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 d1866f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,92 +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
- * -------- -------- -----------------------------------------------------------
- * 20060612   145433 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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;
-     if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS;
-     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(); 
-     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 0427721..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,143 +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
- * -------- -------- -----------------------------------------------------------
- * 20060523   142296 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-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\"%>"+ StringUtils.NEWLINE);
-      fbuffer.append("<% request.setCharacterEncoding(\"UTF-8\"); %>"+ StringUtils.NEWLINE);
-      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 a1677f7..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 b122807..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 d60d897..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070410   180952 makandre@ca.ibm.com - Andrew Mak, Sample JSP generator chokes on interfaces and abstract classes
- * 20071110   209087 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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";
-       if(!type.isPrimitive()){
-		  
-		   fbuffer.append(Generator.DOUBLE_TAB + Generator.TAB + type.getName() + " " + nodeName + " = null;" + StringUtils.NEWLINE);	   		   
-		   fbuffer.append(Generator.DOUBLE_TAB + "if(!" + getTypeOwnerId() + ".equals(\"\")){" + StringUtils.NEWLINE);
-		   fbuffer.append(dataType.stringConversion("",nodeName,getTypeOwnerId()));
-		   fbuffer.append(Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE);		   	       
-	   }
-       else
-    	   fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
-       putResidentVector(nodeName);
-     }
-
-     else {
-       //must be complex
-       String typeName = typeElement.getName(); 
-       fTypeIdName = idName(typeName);
-              
-       if (!Boolean.TRUE.equals(typeElement.getPropertyAsObject(TypeElement.NON_INSTANTIABLE))) {
-       
-	       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);
-	       } 
-	   }
-       else
-    	   fbuffer.append(Generator.DOUBLE_TAB + typeName + " " + fTypeIdName + " = null;"+ 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 04714bb..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 d1d7f87..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 b408104..0000000
--- 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 74f4b01..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private Method fReadMethod;
-  private Method fWriteMethod;
-  private String fPropertyName;
-  private JavaHelpers fPropertyType; 
-  private boolean fStatic;
-  
-  /*
-  * Constructor
-  **/
-  public SamplePropertyDescriptor(String name)
-  {
-    fPropertyName = name; 
-  }
-
-  /*
-  * set the ReadMethod
-  */
-  public void setReadMethod(Method readMethod)
-  {
-    fReadMethod = readMethod;
-  }
-
-   /*
-  * get the ReadMethod 
-  */
-  public Method getReadMethod()
-  {
-    return fReadMethod;
-  }
-
-  /*
-  * set the writeMethod
-  */
-  public void setWriteMethod(Method writeMethod)
-  {
-    fWriteMethod = writeMethod;
-  }
-
-   /*
-  * get the writeMethod 
-  */
-  public Method getWriteMethod()
-  {
-    return fWriteMethod;
-  }
-
-  /*
-  * set the propertyName
-  */
-  public void setName(String name)
-  {
-    fPropertyName= name;
-  }
-
-   /*
-  * get the propertyName
-  */
-  public String getName()
-  {
-    return fPropertyName;
-  }
-
-  /*
-  * set the PropertyType
-  */
-  public void setPropertyType(JavaHelpers propertyType)
-  {
-    fPropertyType = propertyType;
-  }
-
-   /*
-  * get the PropertyType 
-  */
-  public JavaHelpers getPropertyType()
-  {
-    return fPropertyType;
-  }
-      
-  public boolean isfStatic()
-  {
-  	return fStatic;
-  }
-
-  public void setfStatic(boolean fStatic)
-  {
-    this.fStatic = fStatic;	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
-  public String getID();
-  public void setID(String id);
-
-  public String getName();
-  public void setName(String name);
-
-  public String getDescription();
-  public void setDescription(String desc);
-
-  public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 75614bb..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 1bbf27a..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is 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 97ea2bd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 abb9013..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JspUtils {
-	public static String markup(String text) {
-			if (text == null) {
-				return null;
-			}
-
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < text.length(); i++) {
-				char c = text.charAt(i);
-				switch (c) {
-					case '<':
-						buffer.append("&lt;");
-						break;
-					case '&':
-						buffer.append("&amp;");
-						break;
-					case '>':
-						buffer.append("&gt;");
-						break;
-					case '"':
-						buffer.append("&quot;");
-						break;
-					default:
-						buffer.append(c);
-						break;
-				}
-			}
-			return buffer.toString();
-		}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index 1803006..0000000
--- 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 0d670fe..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 ac43cda..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementSaxHandler.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20090806   285933 ericdp@ca.ibm.com - Eric D. Peters, SOAPElementSaxHandler to create text nodes results in null return for char size 1
- *******************************************************************************/
-
-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 > 0)
-		{
-			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.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index 196d49a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 8e6edef..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
-src.zip
-javaCompiler...args
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 b9c8bfc..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.creation.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.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 8bab189..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Sat Jun 02 17:07:06 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-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=error
-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.5
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 5971ac0..0000000
--- 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 7576991..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/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.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 1.0.310.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;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.ant;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.extension;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.preferences;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.server;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;x-internal:=true,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test;x-internal:=true
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.0.101,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.wst.ws.explorer;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jst.ws.consumption;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.ws.ui;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
deleted file mode 100644
index 3d6bcab..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/export_ws_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
deleted file mode 100644
index 45f876a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
deleted file mode 100644
index 5d37933..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_assemble.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
deleted file mode 100644
index bd58bc0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_deploy.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
deleted file mode 100644
index 38ff6a6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_develop.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
deleted file mode 100644
index 58fcdba..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_install.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
deleted file mode 100644
index 5c912f7..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_run.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg b/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
deleted file mode 100644
index ab56959..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/service_test.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index d6e85f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,62 +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
-###############################################################################
-
-#
-# 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 S&keleton 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 99c1b77..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,392 +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.png"
-            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">
-      <category
-             id="org.eclipse.jst.ws.creation.ui.wsexport.category"
-             name="%PLUGIN_NEW_CATEGORY_NAME_WS"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            icon="icons/export_ws.gif"
-            category="org.eclipse.jst.ws.creation.ui.wsexport.category"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.consumption.ui.wsexport">
-         <description>
-            %PLUGIN_EXPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/export_ws_wiz.png"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="org.eclipse.jst.ws.consumption.ui.wsexport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/export_ws_wiz.png"
-            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"
-            objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb org.eclipse.jst.ws.creation.ui.wizard.serverwizard.ejb3 org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.file org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.compunit org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.service.bean org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java.bean.link"
-            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"
-            objectids="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsdl org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.service org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.wsdlres org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.serviceref org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton.file.wsil"
-            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"
-            objectids="org.eclipse.jst.ws.creation.ui.wizard.publish.file org.eclipse.jst.ws.creation.ui.wizard.publish.service org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref"
-            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.file">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.compunit">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.file.wsdl">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.service">
-         <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.wsdlres">
-         <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.serviceref">
-         <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.service.bean">
-         <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.bean.link">
-         <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.file.wsil">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.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.file">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.wst.ws.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-
-       <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish.service">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-                  menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-      
-       <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish.wsdlres">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-                  menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-      
-       <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish.serviceref">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-                  menubarPath="additions"
-               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"
-              required="true"
-              transform="org.eclipse.jst.ws.internal.common.String2SelectionTransformer"/>
-        <map
-              key="InitialSelection"
-              operation="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand"
-              property="ObjectSelection"
-              required="true"
-              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.StringToIProjectTransformer"/>
-        <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="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.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand"
-              property="ServiceProjectName"/>
-              
-      <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 eb7d98c..0000000
--- 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, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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 eb19e8b..0000000
--- 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 58aa105..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/ant/AntServiceRootCommandFragment.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060530   144358 kathy@ca.ibm.com - Kathy Chan
- * 20060530   144350 kathy@ca.ibm.com - Kathy Chan
- * 20060823   154938 pmoogk@ca.ibm.com - Peter Moogk
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20061011   159283 makandre@ca.ibm.com - Andrew Mak, project not associated to EAR when using ant on command-line
- * 20070501   178129 makandre@ca.ibm.com - Andrew Mak, workspace reports "crash detected" after running WS ant task (cmdline)
- * 20080729   241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- * 20080925   242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.ant;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntDefaultingOperation;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntRestoringCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.AntWorkspaceSaveCommand;
-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.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-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 ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-    add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));   
-    add( new ServiceRootFragment() );
-    add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-    add(new FinishFragment());
-    add( new SimpleFragment( new AntRestoringCommand(), "" ));
-    add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    add( new SimpleFragment( new AntWorkspaceSaveCommand(), ""));
-  }
-  
-  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(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-	
-    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);
-    
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", 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);
-    
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.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);
-    dataRegistry.addMapping(AntDefaultingOperation.class, "DeployService", 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);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-    	  
-	// 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, "ServiceComponentType", ServerExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.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( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
-    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
-    
-    
-    
-	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);
-    
-    dataRegistry.addMapping(AntDefaultingOperation.class, "RendererValidation", AntRestoringCommand.class);
-    
-  }
-
-}
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 e2d7657..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060330 128827   kathy@ca.ibm.com - Kathy Chan
- * 20060524   141925 kathy@ca.ibm.com - Kathy Chan
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
- * 20071218	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220   213640 kathy@ca.ibm.com - Kathy Chan
- * 20080325   222473 makandre@ca.ibm.com - Andrew Mak, Create EAR version based on the version of modules to be added
- * 20090415   264683 danail.branekov@sap.com - Danail Branekov
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.lang.reflect.InvocationTargetException;
-
-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.Status;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.FacetUtils;
-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.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentMergeContext;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-  private IContext          context_;
-  private IProject		initialProject_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  IEnvironment environment = getEnvironment();
-	  IStatus status = Status.OK_STATUS;
-	  
-	  // For top down scenarios, merge the content of the skeleton files with the previous version stored.	  
-	  // The Web service extensions triggers the storing of the content of the old skeleton file by 
-	  // calling WebServiceInfo.setImplURLs() before the new skeleton is generated in the extension's 
-	  // develop() method.
-	  
-	  if (context_.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-		  PersistentMergeContext mergeContext = WSPlugin.getInstance().getMergeContext();
-		  IMerger merger = webService_.getWebServiceInfo().getMerger();
-		  if (mergeContext.isSkeletonMergeEnabled() && merger != null) {
-			  status = merger.merge(monitor, getEnvironment().getStatusHandler());	
-			  if (status.getSeverity() == Status.ERROR) {
-				  environment.getStatusHandler().reportError(status);
-				  return status;
-			  }		
-		  }
-	  }
-	  
-	  if (context_.getAssemble()) {
-
-		  // 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);
-
-		  IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
-		  command.setRequiredFacetVersions(FacetUtils.getRequiredEARFacetVersions(project)); 
-
-		  command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
-		  command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-		  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);		  
-		  }			
-
-		  //make sure the ear file has been created.
-		  
-		  if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)) {
-			  IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
-			  addJavaProjectAsUtilityInModalCtx(initialProject_, earProject, monitor);
-		  }		 
-	  
-	  }
-	  return status;	  
-  }
-  
-  private void addJavaProjectAsUtilityInModalCtx(final IProject projectToAdd, final IProject earProject, final IProgressMonitor monitor)
-	{
-		final IRunnableWithProgress addRunnable = new IRunnableWithProgress()
-		{
-			public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-			{
-				J2EEUtils.addJavaProjectAsUtilityJar(projectToAdd, earProject, monitor);
-			}
-		};
-
-		try
-		{
-			ModalContext.run(addRunnable, true, monitor, PlatformUI.getWorkbench().getDisplay());
-		} catch (InvocationTargetException e)
-		{
-			// The executed runnable does not throw checked exceptions therefore if this happens, this is a runtime exception
-			throw new RuntimeException(e);
-		} catch (InterruptedException e)
-		{
-			// The executed runnable does not support cancellation and this should never happen
-			throw new IllegalStateException(e);
-		}
-	}
-	
-  public void setInitialProject(IProject initialProject)
-  {
-	  initialProject_ = initialProject;  
-  }	
-    
-  public IProject getInitialProject()
-  {
-	  return initialProject_;  
-  }	
-  
-  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/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 4e55759..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null
@@ -1,42 +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
- * -------- -------- -----------------------------------------------------------
- * 20060221   119111 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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
-  private IContext    context_;
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      if (context_.getDeploy())
-      {
-        //If and when there are framework specific deploy things to be done,
-        //do them here.
-      }
-      
-	  return Status.OK_STATUS;
-  }
-  
-  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/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 dabde40..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060516   126965 kathy@ca.ibm.com - Kathy Chan
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070123   167487 makandre@ca.ibm.com - Andrew Mak
- * 20070403   173654 kathy@ca.ibm.com - Kathy Chan
- * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
- * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071220   213640 kathy@ca.ibm.com - Kathy Chan
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080724   241275 pmoogk@ca.ibm.com - Peter Moogk, Validate WSDL before doing major Web service processing.
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090415   264683 danail.branekov@sap.com - Danail Branekov
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-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.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.operation.ModalContext;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-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.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TimedWSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-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.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.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.ILog;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.common.HTTPUtility;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.IMerger;
-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 IProject			initialProject_;
-	
-  private IWebService       webService_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-  
-  private boolean develop_;
-  private boolean assemble_;
-  private boolean deploy_;
-  private boolean install_;
-  private boolean run_;
-  private boolean client_;
-  private boolean test_;
-  private boolean publish_;
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  IStatus status = Status.OK_STATUS;
-	  if (develop_) {
-		  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() );
-		  
-		  environment.getLog().log(ILog.INFO, "ws_framework", 5107, this, "PreServiceDevelopCommand", "serviceRuntimeId_ = "+ serviceRuntimeId_);
-		  ServiceRuntimeDescriptor serviceRuntimeDescriptor =  WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_);
-		  IMerger merger = serviceRuntimeDescriptor.getServiceImplementationType().getMergerClass();
-		  wsInfo.setMerger(merger);		  
-
-		  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];
-			  
-			  // check for redirection in the wsdl
-			  HTTPUtility httpUtil = new HTTPUtility();
-			  String      newWsdlURL  = httpUtil.handleRedirect(wsdlURL);
-			  
-			  wsInfo.setWsdlURL( newWsdlURL );   
-			  
-			  // Validate the url before proceeding.
-			  TimedWSDLSelectionConditionCommand timedCmd = new TimedWSDLSelectionConditionCommand();
-			  WebServicesParser                  parser   = WSDLParserFactory.getWSDLParser();
-			  
-			  timedCmd.setWebServicesParser( parser );
-			  timedCmd.setWebServiceURI( newWsdlURL );
-			  timedCmd.execute( null, null );
-			  
-	      WebServiceEntity entity = parser.getWebServiceEntityByURI( newWsdlURL );
-	      
-	      if( entity == null || entity.getType() != WebServiceEntity.TYPE_WSDL )
-	      {
-	        // This isn't a wsdl file
-	        status = StatusUtils.errorStatus( ConsumptionUIMessages.PAGE_MSG_SELECTION_MUST_BE_WSDL );
-          environment.getStatusHandler().reportError( status );
-          return status;
-	      }
-		  }
-
-		  context_     = new SimpleContext(develop_, assemble_, deploy_, install_, run_, client_, test_, publish_, 
-				  scenario, 
-				  resourceContext_.isOverwriteFilesEnabled(),
-				  resourceContext_.isCreateFoldersEnabled(),
-				  resourceContext_.isCheckoutFilesEnabled());
-
-		  // Create the service module if needed.
-		  IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(project_);
-		  RequiredFacetVersion[] rfv = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRequiredFacetVersions();
-		  if (!project.exists())
-		  {
-			  boolean matches = WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, moduleType_);
-			  if (matches)
-			  {				  
-				  CreateFacetedProjectCommand command = new CreateFacetedProjectCommand();
-				  command.setProjectName(project_);
-				  command.setTemplateId(moduleType_);
-				  command.setRequiredFacetVersions(rfv);
-				  command.setServerFactoryId(typeRuntimeServer_.getServerId());
-				  command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-				  command.setEarProjectName(earProject_);
-				  status = command.execute( monitor, adaptable );
-				  if (status.getSeverity() == Status.ERROR)
-				  {
-					  environment.getStatusHandler().reportError( status );
-					  return status;
-				  }        
-			  }            
-		  } else {
-			// add facets required by Web service runtime
-		        if (rfv.length != 0) {
-		        	status = FacetUtils.addRequiredFacetsToProject(project, rfv, monitor);
-		        	if (status.getSeverity() == Status.ERROR)
-		        	{
-		        		environment.getStatusHandler().reportError( status );
-		        		return status;
-		        	}      
-		        }
-		  }
-	  
-	  
-		  if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)){
-			  try{
-				addJavaProjectAsUtilityInModalCtx(initialProject_, project, monitor);
-			  } catch (CoreException ce){
-				  String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
-				  IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
-				  environment.getStatusHandler().reportError(errorStatus);
-			  } catch (IOException ioe){
-				  String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
-				  IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
-				  environment.getStatusHandler().reportError(errorStatus);					
-			  }		
-		  }
-	}
-	  return status;
-
-  }
-  
-  /**
-   * Adds the projectToAdd as utility to the ear project specified. The operation is executed in a modal context in order to avoid locking the workspace root in the UI thread 
-   */
-  private void addJavaProjectAsUtilityInModalCtx(final IProject projectToAdd, final IProject earProject, final IProgressMonitor monitor) throws IOException, CoreException
-	{
-		final IRunnableWithProgress addRunnable = new IRunnableWithProgress()
-		{
-			public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-			{
-				J2EEUtils.addJavaProjectAsUtilityJar(projectToAdd, earProject, monitor);
-				try
-				{
-					final String uri = projectToAdd.getName() + ".jar";
-					J2EEUtils.addJAROrModuleDependency(earProject, uri);
-				} catch (IOException e)
-				{
-					throw new InvocationTargetException(e);
-				} catch (CoreException e)
-				{
-					throw new InvocationTargetException(e);
-				}
-			}
-		};
-		
-		try
-		{
-			ModalContext.run(addRunnable, true, monitor, PlatformUI.getWorkbench().getDisplay());
-		} catch (InvocationTargetException e)
-		{
-			final Throwable cause = e.getCause();
-			// IOExcetpion and CoreException thrown by J2EEUtils.addJAROrModuleDependency
-			if(cause instanceof IOException)
-			{
-				throw (IOException)cause;
-			}
-			if(cause instanceof CoreException)
-			{
-				throw (CoreException)cause;
-			}
-			
-			// Other unexpected exception has occurred, rethrow it as a runtime exception
-			throw new RuntimeException(e);
-		} catch (InterruptedException e)
-		{
-			// The executed runnable does not support cancellation and therefore this can never happen
-			throw new IllegalStateException(e);
-		}
-	}
-  
-  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 setDevelopService(boolean developService) {
-		develop_ = developService;
-	}	
-	
-	public void setAssembleService(boolean assembleService) {
-		assemble_ = assembleService;
-	}
-
-	public void setDeployService(boolean deployService) {
-		deploy_ = deployService;
-	}
-  
-	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;  
-  }	
-	
-  public void setInitialProject(IProject initialProject)
-  {
-	  initialProject_ = initialProject;  
-  }	
-    
-  public IProject getInitialProject()
-  {
-	  return initialProject_;  
-  }	
-
-}
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 d75896d..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070815   199626 kathy@ca.ibm.com - Kathy Chan
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080425   220985  - Trung, Server is recreated when prev publish failed
- * 20080429   220985 trungha@ca.ibm.com - Trung Ha
- * 20080520   233065 makandre@ca.ibm.com - Andrew Mak, Server not found error in Web service generation
- *******************************************************************************/
-
-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.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 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)
-				{
-					// Attempt to find a server instance in the workspace matching
-					// the server id of the webService_
-					// If we can find one, we don't need to create a new server.
-					IServer[] allServers = ServerCore.getServers();
-					if (allServers != null && allServers.length > 0) {
-						for (int i = 0; i < allServers.length; i++) {
-							IServer oneServer = allServers[i];
-							if (oneServer.getServerType().getId().equals(
-									webService_.getWebServiceInfo().getServerFactoryId())) {
-								
-								webService_.getWebServiceInfo().setServerInstanceId(oneServer.getId());
-								webService_.getWebServiceInfo().setServerCreated(true);
-							}
-						}
-					}
-					// Cannot find an appropriate server, so we will create one
-					if (webService_.getWebServiceInfo().getServerInstanceId() == null) {
-						CreateServerCommand createServerCommand = new CreateServerCommand();
-						createServerCommand.setServerFactoryid(webService_
-								.getWebServiceInfo().getServerFactoryId());
-						createServerCommand.setServerRuntimeId(webService_
-								.getWebServiceInfo().getServerRuntimeId());
-						createServerCommand.setEnvironment(environment);
-						IStatus createServerStatus = createServerCommand.execute(
-								monitor, null);
-						if (createServerStatus.getSeverity() == Status.OK) {
-							webService_.getWebServiceInfo().setServerInstanceId(
-									createServerCommand.getServerInstanceId());
-							webService_.getWebServiceInfo().setServerCreated(true);
-						} 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 b758bca..0000000
--- 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 d6e853a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060331   128827 kathy@ca.ibm.com - Kathy Chan
- * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-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, "InitialProject", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
-		
-    registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.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 47b8a0b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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
- * -------- -------- -----------------------------------------------------------
- * 20060424   115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060504   138118 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-
-/**
-* 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 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 imageURL = FileLocator.find(instance_.getBundle(), new Path("$nl$/"+name), null);
-     	return ImageDescriptor.createFromURL(imageURL);
-     }
-     catch (Exception 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 34e09f1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,155 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060417   136391 joan@ca.ibm.com - Joan Haggarty
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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, true );
-      serverWidget_.addControls( page, new Listener()
-                                       {
-                                         public void handleEvent( Event evt ){}
-                                       } );      
-	  initializeValues();
-	  serverWidget_.disableNonPreferenceWidgets();
-	  applyDialogFont(page);
-	  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 );
-      //jvh 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_.setTestClient( new Boolean(context.getTestWebService()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
-      serverWidget_.setServiceGeneration(context.getGenerateWebService());  //jvh      
-      serverWidget_.setClientGeneration(context.getGenerateClient());  //jvh
-      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_.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_.setTestClient( new Boolean(context.getTestWebServiceDefault()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
-      serverWidget_.setServiceGeneration(context.getGenerateWebServiceDefault()); //jvh
-      serverWidget_.setClientGeneration(context.getGenerateClientDefault()); //jvh
-      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());
-      context.setGenerateWebService(serverWidget_.getServiceGeneration());      
-      context.setGenerateClient(serverWidget_.getClientGeneration());
-	}
-	
-	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 fc96c1c..0000000
--- 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 98717b1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070328   173345 pmoogk@ca.ibm.com - Peter Moogk, Peek next page problem
- *******************************************************************************/
-
-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_.getRun())
-    {
-      String instanceId = webservice_.getWebServiceInfo().getServerInstanceId();
-      
-      if( instanceId != null && instanceId.length() > 0 )
-      {
-        server = ServerCore.findServer( instanceId );
-      }
-    }
-    
-    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 55d89a8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,1698 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060407   135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407   135443 joan@ca.ibm.com - Joan Haggarty
- * 20060410   135442 kathy@ca.ibm.com - Kathy Chan
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060410   135562 joan@ca.ibm.com - Joan Haggarty
- * 20060411   136167 kathy@ca.ibm.com - Kathy Chan
- * 20060417   136390/136391/136159 joan@ca.ibm.com - Joan Haggarty
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136158 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136705 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   136182 kathy@ca.ibm.com - Kathy Chan
- * 20060420   137820 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060420   135912 joan@ca.ibm.com - Joan Haggarty
- * 20060421   136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424   138052 kathy@ca.ibm.com - Kathy Chan
- * 20060425   137831 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060426   138519 joan@ca.ibm.com - Joan Haggarty
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20060504   138035 joan@ca.ibm.com - Joan Haggarty
- * 20060524   142276 joan@ca.ibm.com - Joan Haggarty
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060605   145081 joan@ca.ibm.com - Joan Haggarty
- * 20060607   144826 joan@ca.ibm.com - Joan Haggarty
- * 20060607   144049 joan@ca.ibm.com - Joan Haggarty
- * 20060614   146270 joan@ca.ibm.com - Joan Haggarty
- * 20060616   147317 joan@ca.ibm.com - Joan Haggarty
- * 20060717   150577 makandre@ca.ibm.com - Andrew Mak
- * 20060726   150865 sengpl@ca.ibm.com -  Seng Phung-Lu
- * 20060803   152486 makandre@ca.ibm.com - Andrew Mak, Typing WSDL in Service definition field is very slow
- * 20060817   140017 makandre@ca.ibm.com - Andrew Mak, longer project or server/runtime strings do not resize wizard
- * 20060825   135570 makandre@ca.ibm.com - Andrew Mak, Service implementation URL not displayed properly on first page
- * 20060829   155441 makandre@ca.ibm.com - Andrew Mak, web service wizard hangs during resize
- * 20060830   155114 pmoogk@ca.ibm.com - Peter Moogk, Updated patch for this defect.
- * 20060831   155441 makandre@ca.ibm.com - Andrew Mak, Small tweak for this bug
- * 20061003   159142 kathy@ca.ibm.com - Kathy Chan
- * 20061212   164177 makandre@ca.ibm.com - Andrew Mak, Incorrect validation error complaining about runtime not supporting a project type
- * 20061212   159911 makandre@ca.ibm.com - Andrew Mak, changing service definition resets some configuration fields
- * 20070205   172687 makandre@ca.ibm.com - Andrew Mak, NPE in Scencario Defaults preferences page
- * 20071130   203826 kathy@ca.ibm.com - Kathy Chan
- * 20080205   170141 kathy@ca.ibm.com - Kathy Chan
- * 20080215   216337 pmoogk@ca.ibm.com - Peter Moogk
- * 20080301   221034 kathy@ca.ibm.com - Kathy Chan
- * 20080312   147442 trungha@ca.ibm.com - Trung Ha
- * 20080318   213330 trungha@ca.ibm.com - Trung, Non-conventional Java naming prevents creating Web Services (client)
- * 20080326   198439 kathy@ca.ibm.com - Kathy Chan
- * 20080402   198439 kathy@ca.ibm.com - Kathy Chan
- * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080417   227599 kathy@ca.ibm.com - Kathy Chan
- * 20080613   236523 makandre@ca.ibm.com - Andrew Mak, Overwrite setting on Web service wizard is coupled with preference
- * 20090926   248448 mahutch@ca.ibm.com - Mark Hutchinson, Should not resize WS Wizard for long WSDL file names
- * 20090121   261730 zhang@ca.ibm.com - Allan Zhang, WebService client runtime id return null
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.common.DefaultingUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ProjectSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.IObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.Timer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-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.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-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.SWT;
-import org.eclipse.swt.accessibility.Accessible;
-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.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-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.events.SelectionListener;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Scale;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.HyperlinkGroup;
-import org.eclipse.ui.forms.HyperlinkSettings;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-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.PageInfo;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-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.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntimeChecker;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor implements Runnable, IPackable {
-	
-	//INFOPOPS
-    /* CONTEXT_ID WSWSCEN0001 for the Scenario Page */
-	private String INFOPOP_WSWSCEN_PAGE = "WSWSCEN0001";
-	 /* CONTEXT_ID WSWSCEN0010 for the Web Service Type combo box of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_COMBO_SERVICETYPE = "WSWSCEN0010";
-	 /* CONTEXT_ID WSWSCEN0014 for the monitor service checkbox of the Scenario page */
-	 private String INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE = "WSWSCEN0014";
-	 /* CONTEXT_ID WSWSCEN0012 for the Launch UDDI check box of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS = "WSWSCEN0012";
-	 /* CONTEXT_ID WSWSCEN0020 for the Service Implemenation text field of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL = "WSWSCEN0020";
-	 /* CONTEXT_ID WSWSCEN0021 for theService Slider of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_SCALE_SERVICE = "WSWSCEN0021";
-	 /* CONTEXT_ID WSWSCEN0022 for the Server hyperlink of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_HYPERLINK_SERVER = "WSWSCEN0022";
-	 /* CONTEXT_ID WSWSCEN0023 for the Runtime hyperlink of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_HYPERLINK_RUNTIME = "WSWSCEN0023";
-	 /* CONTEXT_ID WSWSCEN0024 for theProjects hyperlink of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_HYPERLINK_PROJECTS  = "WSWSCEN0024";
-	 /* CONTEXT_ID WSWSCEN0030 for the Overwrite Files checkbox of the Scenario Page */
-	 private String INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE = "WSWSCEN0030";
-	 
-	private ScaleSelectionListener scaleSelectionListener = new ScaleSelectionListener();
-	private Listener statusListener_;
-	private ModifyListener objectModifyListener_ ;
-	private int validationState_;
-	boolean validObjectSelection_ = true;
-
-	private ImageRegistry imageReg_;
-	
-	private TypeRuntimeServer ids_;
-	private LabelsAndIds labelIds_;
-	private String serviceProjectName_;
-	private IProject initialProject_;
-	private String serviceEarProjectName_;
-	private String serviceComponentType_;
-	private WebServicesParser parser_;
-	private boolean needEar_;
-		 
-	private boolean developService_;
-	private boolean assembleService_;
-	private boolean deployService_;
-	
-	private IStructuredSelection objectSelection_;
-	private Boolean testService_;
-	private Boolean startService_;
-	private Boolean installService_;
-
-	private boolean displayPreferences_;
-	private boolean preferencesPage_;
-
-	private Composite groupComposite_;
-	private Composite hCompService_;	
-	private WebServiceClientTypeWidget clientWidget_;
-    private Label serviceLabel_;
-	private Combo webserviceType_;
-	private Text serviceImpl_;
-	private Scale serviceScale_;
-	private Label topologySpot_;
-	private Button browseButton_;
-	private Button publishButton_;
-	private Button monitorButton_;
-	private Button overwriteButton_;	
-	private ServiceImplSelectionDialog browseDialog_;
-	private ProjectSelectionDialog projectDialog_;
-	private Hyperlink hLinkServiceRuntime_;
-	private Hyperlink hLinkServiceServer_;
-	private Hyperlink hLinkServiceProject_;
-	private Hyperlink hLinkServiceEAR_;
-		
-	private Object objectSelectionWidget_; //may be IObjectSelectionLaunchable or IObjectSelectionWidget
-	
-	private ResourceContext resourceContext_;
-	
-	private Timer timer_ = null;
-		
-	private UIUtils utils_ = new UIUtils("org.eclipse.jst.ws.creation.ui");
-	
-	private boolean forceRefreshRuntime = false;
-	
-	private String GRAPHIC_SERVICE_0="icons/service_test.jpg"; //$NON-NLS-N$
-	private String GRAPHIC_SERVICE_1="icons/service_run.jpg";  //$NON-NLS-N$
-	private String GRAPHIC_SERVICE_2="icons/service_install.jpg"; //$NON-NLS-N$
-	private String GRAPHIC_SERVICE_3="icons/service_deploy.jpg"; //$NON-NLS-N$
-	private String GRAPHIC_SERVICE_4="icons/service_assemble.jpg"; //$NON-NLS-N$
-	private String GRAPHIC_SERVICE_5="icons/service_develop.jpg"; //$NON-NLS-N$
-		
-	private String ICON_SCALE_BG_0="icons/scale0_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_1="icons/scale1_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_2="icons/scale2_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_3="icons/scale3_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_4="icons/scale4_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_5="icons/scale5_bground.jpg"; //$NON-NLS-N$
-	private String ICON_SCALE_BG_6="icons/scale6_bground.jpg"; //$NON-NLS-N$
-
-	private String SERVICE_RUNTIME_PREFIX = ConsumptionUIMessages.LABEL_RUNTIMES_LIST ; 
-    private String SERVICE_SERVER_PREFIX =  ConsumptionUIMessages.LABEL_SERVERS_LIST;
-    private String SERVICE_PROJECT_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_PROJECT;
-    private String SERVICE_EAR_PREFIX = ConsumptionUIMessages.LABEL_SERVICE_EAR_PROJECT;
-    
-    /**
-     * @param displayPreferences Set to true if preferences such as overwrite should be displayed on the wizard page
-     * @param prefPage  Set to true if the widget is being used on the preferences page.  Alters widget layout.
-     */
-	public ServerWizardWidget(boolean displayPreferences, boolean prefPage) {
-		displayPreferences_ = displayPreferences;
-		preferencesPage_ = prefPage;
-		initImageRegistry();
-		validationState_ = ValidationUtils.VALIDATE_ALL;
-	}
-	
-	private Composite serviceComposite_;
-	
-	/**
-	 * Run this ServerWizardWidget, which validates the entry field values.
-	 */
-	public void run() {
-		
-		// do minimal check here, this call will determine if we at least
-		// have a "validObjectSelection_"
-		checkServiceImplTextStatus();
-		
-		if (validObjectSelection_)
-		{
-			boolean refreshRuntime = (getWebServiceScenario() != WebServiceScenario.TOPDOWN); 
-			
-			if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
-		       {
-				IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
-				callObjectTransformation(launchable.getObjectSelection(), launchable.getProject(), launchable.getComponentName(), refreshRuntime);								
-		       }
-			else 
-			{
-				IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
-				callObjectTransformation(widget.getObjectSelection(), widget.getProject(), widget.getComponentName(), refreshRuntime);
-		    }	
-		}
-		else
-			setObjectSelection(null);
-		
-		// do full validation after all transformations and calculations have occurred
-		validationState_ = ValidationUtils.VALIDATE_ALL;
-		statusListener_.handleEvent(null);		
-	}
-	
-	/**
-	 * Pack this widget and the client-side widget as well. 
-	 */
-	private void packSelf() {
-		// don't need to call packIt(), since clientWidget_ has a callback to packIt() already.
-		clientWidget_.packIt();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.widgets.IPackable#packIt()
-	 */
-	public void packIt() {		
-		groupComposite_.pack(true);
-		utils_.horizontalResize(groupComposite_.getShell(), groupComposite_, UIUtils.DEFAULT_PADDING);
-	}
-	
-	public WidgetDataEvents addControls(Composite parent,
-			Listener statusListener) {
-				
-		statusListener_ = statusListener;
-		utils_.createInfoPop(parent, INFOPOP_WSWSCEN_PAGE);
-		
-		Composite typeComposite = utils_.createComposite(parent, 3);
-
-		webserviceType_ = utils_.createCombo(typeComposite,
-				ConsumptionUIMessages.LABEL_WEBSERVICETYPE,
-				ConsumptionUIMessages.TOOLTIP_PWPR_COMBO_TYPE,
-				INFOPOP_WSWSCEN_COMBO_SERVICETYPE, SWT.SINGLE | SWT.BORDER
-						| SWT.READ_ONLY);
-		GridData gdata1 = (GridData) webserviceType_.getLayoutData();
-		gdata1.horizontalSpan = 2;
-		webserviceType_.setLayoutData(gdata1);
-		
-		webserviceType_.addSelectionListener(new SelectionListener(){
-			public void widgetDefaultSelected(SelectionEvent e) {}
-			
-			public void widgetSelected(SelectionEvent e) {
-				String oldTypeId = ids_.getTypeId();
-				int currentSelectionIdx = webserviceType_.getSelectionIndex();
-				String currentTypeId = labelIds_.getIds_()[currentSelectionIdx];
-				if (!oldTypeId.equals(currentTypeId)) {					
-					ids_.setTypeId(currentTypeId);
-					
-					// don't need to refresh runtime or validate fields if we are on the preference page, just return
-					if (preferencesPage_)
-						return;
-						
-					int oldScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(oldTypeId);
-					int currentScenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(currentTypeId);
-
-			      objectSelectionWidget_ = getSelectionWidget();
-					// change the label for the service
-					// implementation/definition based on the web service type
-					handleTypeChange();					
-
-					// After bug 159911, we will not refresh the runtime in TOPDOWN scenario unless we absolutely
-					// have to.  Therefore, if we are switching from another scenario type, we should check if the 
-					// current selections are valid for this TOPDOWN scenario, if not, try to pick a more suitable 
-					// runtime.
-					if (currentScenario == WebServiceScenario.TOPDOWN) {
-						validationState_ = ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES;
-						
-						// this will force a refresh the next time the wsdl is changed
-						forceRefreshRuntime = !checkErrorStatus().isOK();
-					}
-					
-					//if the web service type change is from one top-down type to another
-					//top-down type leave the object selection field in tact and refresh
-					//the server/runtime project defaulting.
-					//Otherwise clear the object selection field since it's value is not valid anymore
-					if (oldScenario==WebServiceScenario.TOPDOWN && currentScenario==WebServiceScenario.TOPDOWN)						
-					{
-						// if switching from one TOPDOWN scenario to another TOPDOWN scenario and
-						// we've determined that the current runtime selection is not suitable, we 
-						// can refresh the runtime now (don't need to wait for the next time the
-						// wsdl is changed).
-						if (forceRefreshRuntime) {
-							refreshServerRuntimeSelection();
-							forceRefreshRuntime = false;
-						}
-					}
-					else
-					{
-						//clear the object selection field
-						// serviceImpl may be null if on the preferences page
-						if (serviceImpl_ != null)
-						{
-							serviceImpl_.removeModifyListener(objectModifyListener_);
-							serviceImpl_.setText("");
-							setObjectSelection(null);
-							serviceImpl_.addModifyListener(objectModifyListener_);
-						}						   
-					}					
-			   validationState_ = ValidationUtils.VALIDATE_ALL;
-			   statusListener_.handleEvent(null);			   
-					
-			}
-		  }
-			
-		});
-		
-		// Create text field and browse for object selection if not on preferences page
-		if (!preferencesPage_)
-		{
-			//text of this label is based on the web service type selected in webserviceType_ combo
-			serviceLabel_ = new Label( typeComposite, SWT.WRAP);
-			serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
-			serviceLabel_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
-
-			serviceImpl_ = new Text(typeComposite, SWT.LEFT | SWT.BORDER );
-			GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-			griddata.widthHint = 225;
-			serviceImpl_.setLayoutData( griddata );
-			serviceImpl_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_TEXT_IMPL);
-			utils_.createInfoPop(serviceImpl_, INFOPOP_WSWSCEN_TEXT_SERVICE_IMPL);
-			
-			objectModifyListener_ = new ModifyListener(){
-				public void modifyText(ModifyEvent e) {
-				    if (serviceImpl_.getText().indexOf(':') > 0) {
-				        timer_ = Timer.newInstance(timer_, Display.getCurrent(), ServerWizardWidget.this);
-				        timer_.startTimer();
-				    }
-				    else
-				        run();
-				}
-			};
-			
-			serviceImpl_.addModifyListener(objectModifyListener_);
-
-			browseButton_ = utils_.createPushButton(typeComposite,
-					ConsumptionUIMessages.BUTTON_BROWSE, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_BROWSE_IMPL, null);
-
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			browseDialog_ = new ServiceImplSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
-					new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION, "", 
-							new WidgetContributorFactory()
-					{	
-						public WidgetContributor create()
-						{	  						 
-							return new ObjectSelectionWidget();
-						}
-					}));		
-			browseButton_.addSelectionListener(new ServiceImplBrowseListener());
-		}
-		// Service Lifecycle section - scales for service & client, graphic
-		
-		groupComposite_ = new Composite(parent, SWT.NONE);
-		GridLayout gclayout = new GridLayout();
-		gclayout.numColumns = 2;
-		gclayout.horizontalSpacing=0;		
-		gclayout.marginHeight=0;		
-		gclayout.marginBottom=5;
-		groupComposite_.setLayout( gclayout );
-	    GridData gcGridData = new GridData(SWT.BEGINNING, SWT.BEGINNING, true, true);
-	    groupComposite_.setLayoutData(gcGridData);		
-	    
-	    groupComposite_.addControlListener(new ControlListener()
-		{
-			public void controlMoved(ControlEvent e) {
-				// TODO Auto-generated method stub
-				
-			}
-			public void controlResized(ControlEvent e) {
-				groupComposite_.pack(true);				
-			}
-		});
-	    
-		serviceComposite_ =  new Composite(groupComposite_, SWT.NONE);
-		GridLayout gridlayout   = new GridLayout();
-	    gridlayout.numColumns   = 2;
-	    gridlayout.horizontalSpacing=0;
-	    gridlayout.marginHeight=0;
-	    serviceComposite_.setLayout( gridlayout );
-	    GridData scGridData = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-	    serviceComposite_.setLayoutData(scGridData);    
-	    
-		serviceComposite_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-	
-		
-		serviceScale_ = new Scale(serviceComposite_, SWT.VERTICAL | SWT.BORDER);
-	    utils_.createInfoPop(serviceScale_, INFOPOP_WSWSCEN_SCALE_SERVICE);
-		serviceScale_.setMinimum(0);
-		serviceScale_.setMaximum(6);
-		serviceScale_.setIncrement(1);
-		serviceScale_.setPageIncrement(1);
-		serviceScale_.addSelectionListener(scaleSelectionListener);
-		serviceScale_.setSelection(getServiceGeneration());
-		serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-		
-		Accessible accessibleScale = serviceScale_.getAccessible();
-		accessibleScale.addAccessibleListener(new AccessibleAdapter(){
-			//	return a string that describes what to do with the slider
-			//  this is read by the screen reader when the slider first gets focus
-			public void getName(AccessibleEvent e) {
-				e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE;			
-			}			
-		});
-		accessibleScale.addAccessibleControlListener(new AccessibleControlAdapter(){
-			// return a meaningful string when the screen reader
-			// attempts to get the value from the service scale
-			public void getValue(AccessibleControlEvent e) {
-				int selection = serviceScale_.getSelection();
-				switch (selection) {
-				case 0:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST;
-					break;
-				case 1:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN;
-					break;
-				case 2:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL;
-					break;
-				case 3:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY;
-					break;
-				case 4:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE;
-					break;
-				case 5:					
-				case 6:
-					e.result = ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP;
-					break;
-				default:
-					break;
-				}								
-			}
-		});	
-		
-		GridData layoutData1 = new GridData();
-		layoutData1.horizontalAlignment=SWT.CENTER;
-		layoutData1.verticalAlignment = SWT.BEGINNING;
-		Rectangle scaleR = (imageReg_.get(ICON_SCALE_BG_0)).getBounds();
-		layoutData1.heightHint=scaleR.height;
-		layoutData1.widthHint=scaleR.width+1;
-		serviceScale_.setLayoutData(layoutData1);		
-		
-		topologySpot_ = new Label(serviceComposite_, SWT.BORDER | SWT.TOP );
-		topologySpot_.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
-		topologySpot_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_SERVICE);
-		
-		GridData layoutData2 = new GridData();		
-		layoutData2.horizontalAlignment=SWT.BEGINNING;				
-		layoutData2.verticalAlignment = SWT.BEGINNING;
-		Rectangle topR = (imageReg_.get(GRAPHIC_SERVICE_0)).getBounds();
-		layoutData2.heightHint=topR.height;
-		layoutData2.widthHint=topR.width;
-		topologySpot_.setLayoutData(layoutData2);		
-				
-		setGraphics(getServiceGeneration());
-		
-		hCompService_ = utils_.createComposite(groupComposite_, 1);
-		
-		Label serviceDetailsLabel = new Label(hCompService_, SWT.NONE);
-		serviceDetailsLabel.setText(ConsumptionUIMessages.LABEL_SUMMARY);
-		
-		hLinkServiceServer_= new Hyperlink(hCompService_, SWT.NULL);
-		utils_.createInfoPop(hLinkServiceServer_, INFOPOP_WSWSCEN_HYPERLINK_SERVER);
-		hLinkServiceServer_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_SERVER);
-		hLinkServiceServer_.addHyperlinkListener(new IHyperlinkListener(){
-			public void linkActivated(HyperlinkEvent e){				
-				launchRuntimeSelectionDialog(false, true);				
-			}
-			public void linkEntered(HyperlinkEvent e){}
-			public void linkExited(HyperlinkEvent e){}			
-		});
-
-		hLinkServiceRuntime_ = new Hyperlink(hCompService_, SWT.NULL);
-		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_RUNTIME);
-		hLinkServiceRuntime_.setToolTipText(ConsumptionUIMessages.TOOLTIP_PWRS_TEXT_RUNTIME);
-		hLinkServiceRuntime_.addHyperlinkListener(new IHyperlinkListener(){
-			public void linkActivated(HyperlinkEvent e){
-								launchRuntimeSelectionDialog(false);
-			}
-			public void linkEntered(HyperlinkEvent e){}
-			public void linkExited(HyperlinkEvent e){}			
-		});
-		
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		projectDialog_ = new ProjectSelectionDialog(workbench.getActiveWorkbenchWindow().getShell(), 
-				new PageInfo(ConsumptionUIMessages.DIALOG_TITILE_SERVICE_PROJECT_SETTINGS, "", 
-                        new WidgetContributorFactory()
-  						{	
-  							public WidgetContributor create()
-  							{	  						 
-  							   return new ProjectSelectionWidget();
-  							}
-  						}));
-		
-		hLinkServiceProject_= new Hyperlink(hCompService_, SWT.NULL);
-		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
-		hLinkServiceProject_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
-		hLinkServiceProject_.addHyperlinkListener(new IHyperlinkListener(){
-			public void linkActivated(HyperlinkEvent e){
-				launchProjectDialog();				
-			}
-			public void linkEntered(HyperlinkEvent e){}
-			public void linkExited(HyperlinkEvent e){}			
-		});
-		
-		hLinkServiceEAR_= new Hyperlink(hCompService_, SWT.NULL);
-		utils_.createInfoPop(hLinkServiceRuntime_, INFOPOP_WSWSCEN_HYPERLINK_PROJECTS);
-		hLinkServiceEAR_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SERVICEPROJECT_LINK);
-		hLinkServiceEAR_.addHyperlinkListener(new IHyperlinkListener(){
-			public void linkActivated(HyperlinkEvent e){
-				launchProjectDialog();			
-			}
-			public void linkEntered(HyperlinkEvent e){}
-			public void linkExited(HyperlinkEvent e){}			
-		});		
-
-		hLinkServiceServer_.setText(SERVICE_SERVER_PREFIX); 
-		hLinkServiceRuntime_.setText(SERVICE_RUNTIME_PREFIX);
-		hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX);
-		hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX);
-		
-		HyperlinkGroup serverRuntimeGroup = new HyperlinkGroup(Display.getCurrent());
-		
-		serverRuntimeGroup.add(hLinkServiceServer_);
-		serverRuntimeGroup.add(hLinkServiceRuntime_);
-		serverRuntimeGroup.add(hLinkServiceProject_);
-		serverRuntimeGroup.add(hLinkServiceEAR_);
-		serverRuntimeGroup.setHyperlinkUnderlineMode(HyperlinkSettings.UNDERLINE_ALWAYS);
-    
-		utils_.createHorizontalSeparator(parent, 1);		
-		
-		// Add client widgets...
-		clientWidget_ = new WebServiceClientTypeWidget(false);
-	    clientWidget_.addControls(parent, statusListener );
-	    clientWidget_.setPackable(this);
-	    clientWidget_.enableClientSlider(serviceScale_.getSelection()<=ScenarioContext.WS_START);
-		
-		// Advanced buttons section
-		utils_.createHorizontalSeparator(parent, 3);
-		
-		Composite advancedButtonPanel = utils_.createComposite(parent, 1);
-		
-		publishButton_ = utils_.createCheckbox(advancedButtonPanel,
-				ConsumptionUIMessages.BUTTON_WSWSCEN_PUBLISH, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS, INFOPOP_WSWSCEN_CHECKBOX_LAUNCH_WS);		
-		monitorButton_ = utils_.createCheckbox(advancedButtonPanel,
-				ConsumptionUIMessages.CHECKBOX_MONITOR_WEBSERVICE, ConsumptionUIMessages.TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE, INFOPOP_WSWSCEN_CHECKBOX_MONITOR_SERVICE);
-
-		if (displayPreferences_ && getResourceContext().isOverwriteFilesEnabled()) {
-			utils_.createHorizontalSeparator(parent, 1);			
-			Composite prefButtonPanel = utils_.createComposite(parent, 1);
-			overwriteButton_ = utils_.createCheckbox(prefButtonPanel,
-					ConsumptionUIMessages.CHECKBOX_OVERWRITE_FILES, ConsumptionUIMessages.TOOLTIP_WSWSCEN_BUTTON_OVERWRITE_FILES, INFOPOP_WSWSCEN_CHECKBOX_OVERWRITE);
-			overwriteButton_.setSelection(getResourceContext()
-					.isOverwriteFilesEnabled());
-			overwriteButton_.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					getResourceContext().setOverwriteFilesEnabled(overwriteButton_.getSelection());
-				}
-			});
-		}
-
-		return this;
-	}	
-	
-	private void launchProjectDialog()
-	{
-		String currentProjectName = getServiceProjectName();
-		String currentEarProjectName = getServiceEarProjectName();
-		String currentProjectType = getServiceComponentType();
-		boolean currentNeedEar = getServiceNeedEAR();
-		
-		projectDialog_.setProjectName(currentProjectName);
-		projectDialog_.setEarProjectName(currentEarProjectName);
-		projectDialog_.setProjectComponentType(currentProjectType);
-		projectDialog_.setNeedEAR(currentNeedEar);
-		
-		int status = projectDialog_.open();
-		if (status == Window.OK)
-		{
-			String newProjectName = projectDialog_.getProjectName();
-			String newEarProjectName = projectDialog_.getEarProjectName();
-			String newProjectType = projectDialog_.getProjectComponentType();
-			boolean newNeedEar = projectDialog_.getNeedEAR();	
-			
-			//Update project settings and validate page if selections changed.
-			if (!newProjectName.equals(currentProjectName)
-					|| !newEarProjectName.equals(currentEarProjectName)
-					|| !newProjectType.equals(currentProjectType)
-					|| newNeedEar != currentNeedEar) {
-				setServiceProjectName(newProjectName);
-				setServiceEarProjectName(newEarProjectName);
-				setServiceComponentType(newProjectType);
-				setServiceNeedEAR(newNeedEar);				
-				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_PROJECT_CHANGES);
-				statusListener_.handleEvent(null);
-			}
-			
-			/*check to see if text has changed for project and EAR
-			if so, repaint links */
-			if (!newProjectName.equals(currentProjectName))
-			{
-				hLinkServiceProject_.pack(true);
-				packSelf();	 
-			}
-			if (!newEarProjectName.equals(currentEarProjectName))
-			{
-				hLinkServiceEAR_.pack(true);
-				packSelf();	  					
-			}
-		}
-	}
-		
-	private void launchRuntimeSelectionDialog(boolean clientContext)
-	{
-		launchRuntimeSelectionDialog(clientContext, false);
-	}
-		
-	private void launchRuntimeSelectionDialog(boolean clientContext, boolean selectServerFirst) 	
-	{	
-		byte mode = clientContext ? (byte)1 : (byte)0;
-		
-		//TODO: jvh - investigate - don't think j2ee version shouldn't be hard coded (last parm) 
-		//  question - where to pick it up from?
-		//Remember the current values
-		TypeRuntimeServer currentServiceTRS = getServiceTypeRuntimeServer();
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		RuntimeServerSelectionDialog rssd = new RuntimeServerSelectionDialog(
-				workbench.getActiveWorkbenchWindow().getShell(), mode, currentServiceTRS, "14");	
-		rssd.setSelectServerFirst(selectServerFirst);		
-		int result = rssd.open();		
-		if (result == Window.OK)
-		{
-			TypeRuntimeServer newServiceTRS = rssd.getTypeRuntimeServer();
-			if (!currentServiceTRS.equals(newServiceTRS))
-			{
-				setServiceTypeRuntimeServer(newServiceTRS);	
-				refreshClientServerRuntimeSelection();	
-				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
-				clientWidget_.setValidationState(ValidationUtils.VALIDATE_SERVER_RUNTIME_CHANGES);
-				statusListener_.handleEvent(null); //Revalidate the page since server/runtime selections changed.
-			}
-			
-		}		
-	}	
-	
-	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 setStartClient(Boolean startClient) {
-		clientWidget_.setStartClient( startClient );
-	}
-
-	public Boolean getStartClient() {		
-		return clientWidget_.getStartClient();
-	}
-	
-	public void setTestClient(Boolean testClient) {
-		clientWidget_.setTestClient( testClient );
-	}
-
-	public Boolean getTestClient() {		
-		return clientWidget_.getTestClient();
-	}
-	
-	public void setDevelopClient(boolean develop) {
-		clientWidget_.setDevelopClient( develop );
-	}
-
-	public boolean getDevelopClient() {		
-		return clientWidget_.getDevelopClient();
-	}
-	
-	public void setAssembleClient(boolean assemble) {
-		clientWidget_.setAssembleClient( assemble );
-	}
-
-	public boolean getAssembleClient() {		
-		return clientWidget_.getAssembleClient();
-	}
-	
-	public void setDeployClient(boolean deploy) {
-		clientWidget_.setDeployClient( deploy );
-	}
-
-	public boolean getDeployClient() {		
-		return clientWidget_.getDeployClient();
-	}
-
-private void handleTypeChange()
-	{
-		if (!preferencesPage_) {
-		   int scenario = getWebServiceScenario();
-		   
-		   if (scenario == WebServiceScenario.BOTTOMUP)
-		   {
-			  serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEIMPL);
-		   }
-		   else if (scenario == WebServiceScenario.TOPDOWN)
-		   {
-			   serviceLabel_.setText(ConsumptionUIMessages.LABEL_WEBSERVICEDEF);
-		   }
-		}
-	}
-
-	public void setServiceTypeRuntimeServer(TypeRuntimeServer ids) {
-		LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils2
-				.getServiceTypeLabels();
-		// rskreg
-		int selection = 0;
-		String[] serviceIds = labelIds.getIds_();
-		String selectedId = ids.getTypeId();
-
-		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);
-		
-		ids_ = ids;
-		
-		if (ids_ != null)
-		{
-			String serviceServerText = "";
-			String serverId = ids_.getServerId();
-			if (serverId != null && serverId.length()>0)
-			{
-			  serviceServerText = WebServiceRuntimeExtensionUtils2.getServerLabelById(serverId);
-			}
-			String serviceRuntimeText = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(ids_.getRuntimeId());
-			
-			String currentServerText = hLinkServiceServer_.getText();
-			String currentRuntimeText = hLinkServiceRuntime_.getText();
-			String newServerText = SERVICE_SERVER_PREFIX + " " + serviceServerText;
-			String newRuntimeText = SERVICE_RUNTIME_PREFIX + " " + serviceRuntimeText;
-			hLinkServiceServer_.setText(newServerText);
-			hLinkServiceRuntime_.setText(newRuntimeText);		
-			
-			/*check to see if text has changed for server or runtime
-			if so, repaint links */
-			if (!newServerText.equals(currentServerText))
-			{
-				hLinkServiceServer_.pack(true);
-				packSelf();
-			}			
-			
-			if (!newRuntimeText.equals(currentRuntimeText))
-			{
-				hLinkServiceRuntime_.pack(true);
-				packSelf();
-			} 
-		}				
-		labelIds_ = labelIds;
-		handleTypeChange();
-		
-		if (projectDialog_ != null)
-			projectDialog_.setTypeRuntimeServer(ids_);
-		
-		
-		//When the server changes, the state of needEar could change.
-		//If the the server change results in a change in the state of needEar,
-		//update needEar and serviceEarProjectName.
-		ValidationUtils vu = new ValidationUtils();
-		boolean oldNeedEar = getServiceNeedEAR();
-		boolean serviceProjectOrProjectTypeNeedsEar;
-
-		if (!oldNeedEar)
-		{
-			//If an EAR was not needed previously it could have been because of the project/project type or the server.
-			//If it was because of the project/project type, changing the server should have no impact
-			//on the state of needEar.
-			serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
-		}
-		else
-		{
-			serviceProjectOrProjectTypeNeedsEar = true;
-		}
-		
-		//boolean serviceProjectOrProjectTypeNeedsEar = vu.projectOrProjectTypeNeedsEar(getServiceProjectName(), getServiceComponentType());
-		if (serviceProjectOrProjectTypeNeedsEar)
-		{
-			//Could not rule out need for an Ear from the project/project type so changing the server
-			//may impact the need for an Ear.
-
-			boolean currentServiceServerNeedsEar = vu.serverNeedsEAR(getServiceTypeRuntimeServer().getServerId());
-			if (oldNeedEar != currentServiceServerNeedsEar)
-			{
-				//Update needEar and serviceEarProjectName.
-				if (currentServiceServerNeedsEar)
-				{
-					//Calculate a reasonable default for the Ear project name
-					String earProjectName = DefaultingUtils.getDefaultEARProjectName(getServiceProjectName());
-					setServiceNeedEAR(currentServiceServerNeedsEar);
-					setServiceEarProjectName(earProjectName);
-				}
-				else
-				{
-					setServiceNeedEAR(currentServiceServerNeedsEar);
-					setServiceEarProjectName("");					
-				}
-				
-			}
-		}		
-	}
-
-	public TypeRuntimeServer getServiceTypeRuntimeServer() {
-		return ids_;
-	}
-
-	public void setServiceGeneration(int value)
-	{
-		serviceScale_.setSelection(value);
-		setGraphics(value);
-		
-		//enable client widget based on service scale setting
-		clientWidget_.enableClientSlider(value<=ScenarioContext.WS_START);
-		
-		/*for popup case need to make sure that the UI is refreshed based on 
-		changes to data*/
-		packSelf();
-	}	
-
-	public int getServiceGeneration()
-	{
-		return serviceScale_.getSelection();
-	}
-	
-	public boolean getDevelopService() {
-		return developService_;
-	}
-
-	public void setDevelopService(boolean developService) {
-		this.developService_ = developService;
-	}	
-	
-	public boolean getAssembleService() {
-		return assembleService_;
-	}
-
-	public void setAssembleService(boolean assembleService) {
-		this.assembleService_ = assembleService;
-	}
-
-	public boolean getDeployService() {
-		return deployService_;
-	}
-
-	public void setDeployService(boolean deployService) {
-		this.deployService_ = deployService;
-	}
-	
-	public Boolean getStartService(){
-		return startService_;
-	}
-	
-	public void setStartService(Boolean value) {
-        startService_=value;
-	}
-
-	public Boolean getInstallService() {
-		return installService_;
-	}
-
-	public void setInstallService(Boolean value) {
-        installService_=value;
-	}
-
-	public Boolean getTestService() {
-        return 
-        new Boolean( testService_.booleanValue() || clientWidget_.getTestClient().booleanValue());
-	}
-
-	public void setTestService(Boolean value) {
-        testService_= value;
-	}
-	public Boolean getMonitorService() {
-		return new Boolean(monitorButton_.getSelection());
-	}
-
-	public void setMonitorService(Boolean value) {
-		monitorButton_.setSelection(value.booleanValue());
-	}
-
-	public Boolean getPublishService() {		
-		return new Boolean(publishButton_.getSelection());
-	}
-
-	public void setPublishService(Boolean value) {
-		publishButton_.setSelection( value.booleanValue() );
-	}
-
-	public Boolean getGenerateProxy() {
-		return new Boolean(clientWidget_.getGenerateProxy());		
-	}
-
-	public void setClientGeneration(int value)
-	{
-		clientWidget_.setClientGeneration(value);
-		/*for popup case need to make sure that the UI is refreshed based on 
-			changes to data*/
-		packSelf();
-	}
-	
-	public String getClientEarProjectName()
-	{
-		return clientWidget_.getClientEarProjectName();
-	}
-	
-	public String getClientProjectName()
-	{
-		return clientWidget_.getClientProjectName();
-	}
-	
-	public int getClientGeneration()
-	{
-		return clientWidget_.getClientGeneration();
-	}	
-
-	public ResourceContext getResourceContext() {
-		if (resourceContext_ == null) {
-			resourceContext_ = WebServicePlugin.getInstance()
-					.getResourceContext();
-		}
-		return resourceContext_;
-	}
-
-	public void setResourceContext(ResourceContext context) {
-		resourceContext_ = context;
-	}
-
-	public IStructuredSelection getObjectSelection()
-	{
-		return objectSelection_;		
-	}
-	
-	public void setObjectSelection(IStructuredSelection selection )
-	{
-		objectSelection_ = selection;
-	}
-	
-	public WebServicesParser getWebServicesParser()
-	{
-		return parser_;
-	}
-	
-	public void setWebServicesParser(WebServicesParser parser)
-	{
-		parser_ = parser;
-		clientWidget_.setWebServicesParser(parser);
-	}
-	
-	public void internalize() {		
-		
-		if (preferencesPage_)
-			return;
-		
-		if (objectSelectionWidget_ == null)
-			objectSelectionWidget_ = getSelectionWidget();
-		
-		String displayable = null;
-		
-		if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable) {		
-			IObjectSelectionLaunchable launchable = (IObjectSelectionLaunchable) objectSelectionWidget_;
-			launchable.setInitialSelection(objectSelection_);
-			objectSelection_ = launchable.getObjectSelection();
-			displayable = launchable.getObjectSelectionDisplayableString();
-		}
-		else {
-			IObjectSelectionWidget selectionWidget = (IObjectSelectionWidget) objectSelectionWidget_;
-			selectionWidget.setInitialSelection(objectSelection_);
-		    displayable = selectionWidget.getObjectSelectionDisplayableString();
-		}
-		
-		if (displayable == null || displayable.length() == 0)
-			return;
-			
-		serviceImpl_.removeModifyListener(objectModifyListener_);
-		serviceImpl_.setText(displayable);
-		serviceImpl_.addModifyListener(objectModifyListener_);
-	}
-
-	public IStatus getStatus() {
-		IStatus status = Status.OK_STATUS;
-
-		IStatus missingFieldStatus = checkMissingFieldStatus();
-		if (missingFieldStatus.getSeverity() == IStatus.ERROR) {
-			return missingFieldStatus;
-		}
-
-		IStatus serviceImplValidationStatus = checkServiceImplTextStatus();
-		if (serviceImplValidationStatus.getSeverity() == IStatus.ERROR) {
-			return serviceImplValidationStatus;
-		}
-		else if (serviceImplValidationStatus.getSeverity() == IStatus.WARNING){
-			return serviceImplValidationStatus;
-		}
-
-		IStatus possibleErrorStatus = checkErrorStatus();
-		if (possibleErrorStatus.getSeverity() == IStatus.ERROR || possibleErrorStatus.getSeverity() == IStatus.WARNING) {
-			return possibleErrorStatus;
-		}
-
-		IStatus possibleWarningStatus = checkWarningStatus();
-		if (possibleWarningStatus.getSeverity() == IStatus.WARNING) {
-			return possibleWarningStatus;
-		}
-
-		// If no warnings/errors were reported, clear validation state on
-		// service side and client side (if enabled)
-		validationState_ = ValidationUtils.VALIDATE_NONE;
-		if (clientWidget_.getGenerateProxy()) {
-			clientWidget_.setValidationState(ValidationUtils.VALIDATE_NONE);
-		}
-
-		return status;
-	}
-	
-	/*
-	 * call validation code in the object selection widget to ensure any
-	 * modifications to the serviceImpl_ field are valid
-	 */
-	private IStatus checkServiceImplTextStatus() {
-		
-		String fieldText = serviceImpl_.getText().trim();
-
-		if (objectSelectionWidget_ == null)
-		{
-			objectSelectionWidget_ = getSelectionWidget();
-		}
-		
-		IObjectSelectionLaunchable launchable = null;
-		if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
-		    {      	
-				launchable = (IObjectSelectionLaunchable)objectSelectionWidget_;
-				validObjectSelection_ = launchable.validate(fieldText);
-			}
-			else 
-			{
-				IObjectSelectionWidget widget = (IObjectSelectionWidget)objectSelectionWidget_;
-				validObjectSelection_ = widget.validate(fieldText);
-			}
-		
-		if (!validObjectSelection_)
-		{
-			int scenario = getWebServiceScenario();
-			
-			if (scenario == WebServiceScenario.BOTTOMUP){
-				if (launchable != null){
-					IStatus valStatus = launchable.validateSelection(new StructuredSelection(fieldText));
-					if (valStatus.getSeverity() == IStatus.WARNING)
-						return StatusUtils.warningStatus(ConsumptionUIMessages.MSG_WARN_SERVICE_IMPL_NAMING_CONVENTION);
-				}
-				else
-					return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_IMPL);
-			}
-			else
-				return StatusUtils.errorStatus(ConsumptionUIMessages.MSG_INVALID_SERVICE_DEF);			
-		}		
-		
-		return Status.OK_STATUS;
-	}
-
-	private int getWebServiceScenario()
-	{
-		   int index = webserviceType_.getSelectionIndex();	
-		   String typeId = labelIds_.getIds_()[index];
-		   return WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);		
-	}
-	
-	private IStatus checkMissingFieldStatus() {
-
-		// 1. Check for missing fields on service side
-		ValidationUtils valUtils = new ValidationUtils();
-		String serviceImpl = serviceImpl_.getText().trim();
-		String typeId = getServiceTypeRuntimeServer().getTypeId();
-		String runtimeId = getServiceTypeRuntimeServer().getRuntimeId();
-		String serverId = getServiceTypeRuntimeServer().getServerId();
-		String projectName = getServiceProjectName();
-		boolean needEar = getServiceNeedEAR();
-		String earProjectName = getServiceEarProjectName();
-		String projectTypeId = getServiceComponentType();
-		
-		IStatus serviceMissingFieldStatus = valUtils.checkMissingFieldStatus(validationState_, typeId, serviceImpl,
-				runtimeId, serverId, projectName, needEar, earProjectName, projectTypeId, false);
-		if (serviceMissingFieldStatus.getSeverity() == IStatus.ERROR) {
-			return serviceMissingFieldStatus;
-		}
-
-		// 2. Check for missing fields on the client side if it's visible.
-		if (clientWidget_.getGenerateProxy()) {
-			IStatus clientMissingFieldsStatus = clientWidget_.checkMissingFieldStatus();
-			if (clientMissingFieldsStatus.getSeverity() == IStatus.ERROR) {
-				return clientMissingFieldsStatus;
-			}
-
-		}
-
-		return Status.OK_STATUS;
-	}
-
-	private IStatus checkErrorStatus() {
-
-		ValidationUtils valUtils = new ValidationUtils();
-
-		// 1. Check for errors on service side
-		String projectName = getServiceProjectName();
-		boolean needEar = getServiceNeedEAR();
-		String earProjectName = getServiceEarProjectName();
-		String projectTypeId = getServiceComponentType();
-		String initialProjectName = "";
-		if (initialProject_ != null) {
-			initialProjectName = initialProject_.getName();
-		} 
-		IStatus serviceSideErrorStatus = valUtils.checkErrorStatus(validationState_, getServiceTypeRuntimeServer(), projectName, initialProjectName, needEar, earProjectName, projectTypeId, false);
-		if (serviceSideErrorStatus.getSeverity() == IStatus.ERROR) {
-			return serviceSideErrorStatus;
-		}
-
-		// 2. Check for errors on client side if it is visible
-		if (clientWidget_.getGenerateProxy()) {
-			IStatus clientSideErrorStatus = clientWidget_.checkErrorStatus();
-			if (clientSideErrorStatus.getSeverity() == IStatus.ERROR) {
-				return clientSideErrorStatus;
-			}
-
-			// 3. Check for errors that span service and client if client side
-			// is visible.
-			int clientValidationState = clientWidget_.getValidationState();
-			if (validationState_ == ValidationUtils.VALIDATE_ALL
-					|| validationState_ == ValidationUtils.VALIDATE_PROJECT_CHANGES
-					|| clientValidationState == ValidationUtils.VALIDATE_ALL
-					|| clientValidationState == ValidationUtils.VALIDATE_PROJECT_CHANGES) {
-				IWebServiceRuntimeChecker runtimeChecker = null;
-
-				String serviceRuntimeId = WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), projectName, projectTypeId);	    		
-				runtimeChecker = WebServiceRuntimeExtensionUtils2.getServiceRuntimeChecker(serviceRuntimeId);
-
-				if (runtimeChecker != null) {
-					return runtimeChecker.checkServiceClientCompatibility(
-							getServiceNeedEAR(), getServiceEarProjectName(), getServiceProjectName(), 
-							clientWidget_.getClientNeedEAR(), clientWidget_.getClientEarProjectName(), 
-							clientWidget_.getClientProjectName());
-				}
-			}
-		}
-
-		return Status.OK_STATUS;
-	}
-
-	private IStatus checkWarningStatus() {
-		ValidationUtils valUtils = new ValidationUtils();
-		// 1. Check for warnings on the service side
-		int scaleSetting = getServiceGeneration();
-		String serverId = getServiceTypeRuntimeServer().getServerId();
-		IStatus serviceWarningStatus = valUtils.checkWarningStatus(validationState_, scaleSetting, serverId, getServiceTypeRuntimeServer().getServerInstanceId(), false);
-		if (serviceWarningStatus.getSeverity() == IStatus.WARNING) {
-			return serviceWarningStatus;
-		}
-
-		// 2. Check for warnings on the client side if it's enabled
-		if (clientWidget_.getGenerateProxy()) {
-			IStatus clientWarningStatus = clientWidget_.checkWarningStatus();
-			if (clientWarningStatus.getSeverity() == IStatus.WARNING) {
-				return clientWarningStatus;
-			}
-
-		}
-
-		return Status.OK_STATUS;
-	}
-		
-	protected void initImageRegistry()
-	{
-		imageReg_ = new ImageRegistry(Display.getCurrent());
-		
-		imageReg_.put(ICON_SCALE_BG_0, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_0));
-		imageReg_.put(ICON_SCALE_BG_1, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_1));
-		imageReg_.put(ICON_SCALE_BG_2, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_2));
-		imageReg_.put(ICON_SCALE_BG_3, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_3));
-		imageReg_.put(ICON_SCALE_BG_4, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_4));
-		imageReg_.put(ICON_SCALE_BG_5, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_5));
-		imageReg_.put(ICON_SCALE_BG_6, WebServiceConsumptionUIPlugin
-				.getImageDescriptor(ICON_SCALE_BG_6));
-		
-		imageReg_.put(GRAPHIC_SERVICE_0, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_0));
-		imageReg_.put(GRAPHIC_SERVICE_1, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_1));
-		imageReg_.put(GRAPHIC_SERVICE_2, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_2));
-		imageReg_.put(GRAPHIC_SERVICE_3, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_3));
-		imageReg_.put(GRAPHIC_SERVICE_4, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_4));
-		imageReg_.put(GRAPHIC_SERVICE_5, WebServiceCreationUIPlugin
-				.getImageDescriptor(GRAPHIC_SERVICE_5));
-	}
-	
-	private void setAdvancedOptions(boolean enabled)
-	{
-		monitorButton_.setEnabled(enabled); 
-		publishButton_.setEnabled(enabled);		
-	}
-	
-	public void setServiceProjectName(String name)
-	  {
-		serviceProjectName_= name;
-		hLinkServiceProject_.setText(SERVICE_PROJECT_PREFIX + " " + serviceProjectName_);
-		hLinkServiceProject_.pack(true);
-		packSelf();	
-	  }
-	
-	public void setInitialProject(IProject project)
-	{
-		initialProject_ = project;
-	}
-	
-	 public void setServiceEarProjectName(String name)
-	  {	  
-		 serviceEarProjectName_ = name;
-		 refreshEARLink();
-	  }
-	 
-	  public void refreshEARLink()
-	  {
-		  hLinkServiceEAR_.setVisible(needEar_); 
-		  if (needEar_)
-		  {			 
-			  hLinkServiceEAR_.setText(SERVICE_EAR_PREFIX + " " + serviceEarProjectName_);
-			  hLinkServiceEAR_.pack(true);
-			  packSelf();
-		  }
-	  }
-	 public void setServiceComponentType( String type )
-	  {
-		 serviceComponentType_ = type;
-	  }
-	 
-	  public void setClientProjectName(String name)
-	  {
-	    clientWidget_.setClientProjectName(name);  
-	  }  
-	  
-	  public void setClientEarProjectName(String name)
-	  {
-	    clientWidget_.setClientEarProjectName(name);  
-	  }
-	  
-	  IProject project_;
-	  
-	  public String getServiceComponentType()
-	  {
-		  return serviceComponentType_;
-	  }
-	  
-	  public void setClientComponentType(String type)
-	  {
-		  clientWidget_.setClientComponentType(type);
-	  }
-	  
-	  public String getClientComponentType()
-	  {
-		  return clientWidget_.getClientComponentType();
-	  }
-	 
-	  public String getServiceProjectName()
-	  {
-		  return serviceProjectName_;
-	  }
-	  
-	  public String getServiceEarProjectName()
-	  {
-		  return serviceEarProjectName_;
-	  }
-	  
-	  public void setClientProject(IProject project)
-	  {
-		  clientWidget_.setProject(project);
-	  }
-	  
-	  private IProject getClientProject()
-	  {
-		  return clientWidget_.getProject(); 
-	  }
-	  
-	  public void setProject(IProject project)
-	  {
-		  project_ = project;
-	  }	  
-	  	  
-	  public IProject getProject()
-	  {
-		  return project_;
-	  }
-	  
-	  public String getServiceRuntimeId()
-	  {
-		  // calculate the most appropriate serviceRuntimeId based on current settings.
-		  return WebServiceRuntimeExtensionUtils2.getServiceRuntimeId(getServiceTypeRuntimeServer(), getServiceProjectName(), getServiceComponentType());    
-	  }
-	  
-	  public String getClientRuntimeId()
-	  {
-		  return clientWidget_.getClientRuntimeId();
-	  }
-	  
-	  public void setServiceNeedEAR(boolean b)
-	  {
-		  needEar_ = b;
-		  refreshEARLink();
-	  }
-	  
-	  public boolean getServiceNeedEAR()
-	  {
-		  return needEar_;
-	  }
-	  
-	  public void setClientNeedEAR(boolean b)
-	  {
-	    clientWidget_.setClientNeedEAR(b);
-	  }	  
-	  
-	  public boolean getClientNeedEAR()
-	  {
-		  return clientWidget_.getClientNeedEAR();
-	  }
-	  
-	  // looks through extensions and returns the appropriate selection widget
-	  private Object getSelectionWidget()
-	  {
-			String         wst      = getServiceTypeRuntimeServer().getTypeId();
-			int            scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(wst);
-			String         implId   = WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(wst);
-		  WebServiceImpl wsimpl   = WebServiceRuntimeExtensionUtils2.getWebServiceImplById(implId);
-      Object         result   = null;
-        
-		    
-		  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();
-		    }
-        
-        ObjectSelectionRegistry registry = ObjectSelectionRegistry.getInstance();
-        boolean editable = registry.getExternalModify( objectSelectionWidgetId );
-                
-        serviceImpl_.setEditable( editable );
-        result = registry.getSelectionWidget( objectSelectionWidgetId );
-      }
-      
-		  return result;
-	  }
-	 
-	// for the purposes of disabling the service implementation controls from the preferences dialog
-	public void disableNonPreferenceWidgets()
-	{
-		if (serviceImpl_ != null)
-			serviceImpl_.setEnabled(false);
-		if (browseButton_ != null)
-			browseButton_.setEnabled(false);
-		if (hCompService_ != null)
-		{
-			hCompService_.setVisible(false);			
-		}
-		clientWidget_.disableNonPreferenceWidgets();
-	}
-	
-	private void setGraphics(int value)
-	{
-		String iconImage = "";
-		String toplogyImage = "";
-		switch (value) {
-		case 0:
-			iconImage=ICON_SCALE_BG_0;
-			toplogyImage=GRAPHIC_SERVICE_0;
-			break;
-		case 1:
-			iconImage=ICON_SCALE_BG_1;
-			toplogyImage=GRAPHIC_SERVICE_1;
-			break;
-		case 2:
-			iconImage=ICON_SCALE_BG_2;
-			toplogyImage=GRAPHIC_SERVICE_2;
-			break;
-		case 3:
-			iconImage=ICON_SCALE_BG_3;
-			toplogyImage=GRAPHIC_SERVICE_3;
-			break;
-		case 4:
-			iconImage=ICON_SCALE_BG_4;
-			toplogyImage=GRAPHIC_SERVICE_4;
-			break;
-		case 5:					
-		case 6:
-			iconImage=ICON_SCALE_BG_5;
-			toplogyImage=GRAPHIC_SERVICE_5;
-			break;
-		default:
-			break;
-		}
-		serviceScale_.setBackgroundImage(imageReg_.get(iconImage));
-		topologySpot_.setImage(imageReg_.get(toplogyImage));
-	}
-	
-	private void refreshServerRuntimeSelection()
-	{		
-		//new up ServerRuntimeSelectionWidgetDefaultingCommand
-		ServerRuntimeSelectionWidgetDefaultingCommand serverRTDefaultCmd = new ServerRuntimeSelectionWidgetDefaultingCommand();
-		
-		  //call setters of new defaulting command:
-	      serverRTDefaultCmd.setInitialSelection(getObjectSelection());
-	      serverRTDefaultCmd.setInitialProject(getProject());
-	      serverRTDefaultCmd.setGenerateProxy(clientWidget_.getGenerateProxy());
-	      serverRTDefaultCmd.setServiceTypeRuntimeServer(getServiceTypeRuntimeServer());
-		  serverRTDefaultCmd.setWebServicesParser(getWebServicesParser());     
-		  serverRTDefaultCmd.setClientInitialSelection(getObjectSelection());
-	      serverRTDefaultCmd.setClientInitialProject(getClientProject());
-	      serverRTDefaultCmd.setClientEarProjectName(clientWidget_.getClientEarProjectName());
-		  serverRTDefaultCmd.setClientTypeRuntimeServer(getClientTypeRuntimeServer());
-		  		  
-		  serverRTDefaultCmd.execute(null, null);
-		  
-		  //perform mappings from the defaulting command to the project settings...	
-		  setServiceProjectName(serverRTDefaultCmd.getServiceProjectName());
-		  setServiceEarProjectName(serverRTDefaultCmd.getServiceEarProjectName());
-		  setServiceComponentType(serverRTDefaultCmd.getServiceComponentType());
-		  setClientProjectName(serverRTDefaultCmd.getClientProjectName());
-		  setClientEarProjectName(serverRTDefaultCmd.getClientEarProjectName());
-		  setServiceTypeRuntimeServer(serverRTDefaultCmd.getServiceTypeRuntimeServer());
-          setClientTypeRuntimeServer(serverRTDefaultCmd.getClientTypeRuntimeServer());
-          setServiceNeedEAR(serverRTDefaultCmd.getServiceNeedEAR());
-          setClientNeedEAR(serverRTDefaultCmd.getClientNeedEAR());
-          setClientComponentType(serverRTDefaultCmd.getClientComponentType());
-	}
-	
-	/**
-	 *  Update client server and runtime based on service side
-	 */
-	private void refreshClientServerRuntimeSelection()
-	{	
-		TypeRuntimeServer clientTypeRuntimeserver = getClientTypeRuntimeServer();
-		clientTypeRuntimeserver.setRuntimeId(getServiceTypeRuntimeServer().getRuntimeId());
-		clientTypeRuntimeserver.setServerId(getServiceTypeRuntimeServer().getServerId());
-		clientTypeRuntimeserver.setServerInstanceId(getServiceTypeRuntimeServer().getServerInstanceId());
-		setClientTypeRuntimeServer(clientTypeRuntimeserver);
-	}	
-		
-	
-	private void callObjectTransformation(IStructuredSelection objectSelection,
-			IProject project, String componentName, boolean refreshRuntime)
-	{
-		ObjectSelectionOutputCommand objOutputCommand = new ObjectSelectionOutputCommand();
-		   objOutputCommand.setTypeRuntimeServer(getServiceTypeRuntimeServer());
-		   objOutputCommand.setObjectSelection(objectSelection);
-	       objOutputCommand.setProject(project);
-	       objOutputCommand.setComponentName(componentName);			   
-	       
-	       objOutputCommand.execute(null, null);
-        
-	       setWebServicesParser(objOutputCommand.getWebServicesParser());
-	       setObjectSelection(objOutputCommand.getObjectSelection());
-	       setProject(objOutputCommand.getProject());      		       
-	       
-	       if (refreshRuntime || forceRefreshRuntime)
-	    	   refreshServerRuntimeSelection();  
-	       
-	       forceRefreshRuntime = false;
-	}
-	
-	private class ScaleSelectionListener implements SelectionListener
-	{
-		public void widgetSelected(SelectionEvent e) {			
-			    
-			    Scale scale = (Scale)e.widget;
-				int selection = scale.getSelection();
-				
-				//TODO: change the hard coded integers here to the the ScenarioContext.WS_xxx when in less critical phase
-				switch (selection) {
-				case 0:
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_TEST);
-					break;
-				case 1:
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_RUN);
-					break;
-				case 2:
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_INSTALL);
-					break;
-				case 3:
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEPLOY);
-					break;
-				case 4:
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_ASSEMBLE);
-					break;
-				case 5:					
-				case 6:
-					serviceScale_.setSelection(ScenarioContext.WS_DEVELOP); //"no selection" is not allowed...must develop service @ minimum
-					serviceScale_.setToolTipText(ConsumptionUIMessages.TOOLTIP_WSWSCEN_SCALE_DEVELOP);
-					//reset local selection so that setters get correct value below
-					selection = ScenarioContext.WS_DEVELOP;
-					break;
-				default:
-					break;
-				}
-				
-				setDevelopService(selection <= ScenarioContext.WS_DEVELOP);
-				setAssembleService(selection <= ScenarioContext.WS_ASSEMBLE);
-				setDeployService(selection <= ScenarioContext.WS_DEPLOY);
-				
-				setTestService(new Boolean(selection <= ScenarioContext.WS_TEST));
-				setInstallService(new Boolean(selection <= ScenarioContext.WS_INSTALL));
-				setStartService(new Boolean(selection <= ScenarioContext.WS_START));
-				setAdvancedOptions(selection <= ScenarioContext.WS_INSTALL);
-				clientWidget_.enableClientSlider(selection <= ScenarioContext.WS_START);
-				
-				setGraphics(selection);
-				
-				//Validate the page
-				validationState_ = (new ValidationUtils()).getNewValidationState(validationState_, ValidationUtils.VALIDATE_SCALE_CHANGES);
-				statusListener_.handleEvent(null);
-				
-			}		
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-	}
-	
-	private class ServiceImplBrowseListener implements SelectionListener
-	{
-		public void widgetDefaultSelected(SelectionEvent e) {
-			// TODO Auto-generated method stub			
-		}
-		
-		public void widgetSelected(SelectionEvent e) {     
-			   
-			  if (objectSelectionWidget_ == null)
-				   objectSelectionWidget_ = getSelectionWidget();
-			  
-			   IStructuredSelection objectSelection = null;
-			   IProject project = null;
-			   String componentName="";
-			   int result=Dialog.CANCEL;
-			   
-			   if (objectSelectionWidget_ instanceof IObjectSelectionLaunchable)
-		       {      	
-				 IObjectSelectionLaunchable launchable = ((IObjectSelectionLaunchable)objectSelectionWidget_);
-				 launchable.setInitialSelection(getObjectSelection());
-				 IWorkbench workbench = PlatformUI.getWorkbench();
-		         result = launchable.launch(workbench.getActiveWorkbenchWindow().getShell());
-		         if (result == Dialog.OK)
-		         {
-		        	 serviceImpl_.removeModifyListener(objectModifyListener_);
-			         serviceImpl_.setText(launchable.getObjectSelectionDisplayableString());
-			         serviceImpl_.addModifyListener(objectModifyListener_);
-			         objectSelection = launchable.getObjectSelection();
-			         project = launchable.getProject();
-			         componentName= launchable.getComponentName();
-		         }
-		       }
-			   else
-			   {
-				   browseDialog_.setTypeRuntimeServer(getServiceTypeRuntimeServer());
-				   browseDialog_.setInitialSelection(getObjectSelection());
-			       result = browseDialog_.open();
-			       if (result == Dialog.OK)
-			       {
-			    	   serviceImpl_.removeModifyListener(objectModifyListener_);
-				       serviceImpl_.setText(browseDialog_.getDisplayableSelectionString()); 
-				       serviceImpl_.addModifyListener(objectModifyListener_);
-				       objectSelection = browseDialog_.getObjectSelection();
-				       project = browseDialog_.getProject();
-				       componentName= browseDialog_.getComponentName();			       
-			       }
-			   }
-			   
-			   // call ObjectSelectionOutputCommand to carry out any transformation on the objectSelection
-			   if (result == Dialog.OK)
-			   {
-				   callObjectTransformation(objectSelection, project, componentName, getWebServiceScenario() != WebServiceScenario.TOPDOWN);				   
-			       validationState_ = ValidationUtils.VALIDATE_ALL;
-			       statusListener_.handleEvent(null); // validate the page
-			   }			   
-	    }
-	}
-
-	
-}
-
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 788b959..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20070327   172339 kathy@ca.ibm.com - Kathy Chan
- * 20080220   219537 makandre@ca.ibm.com - Andrew Mak
- * 20080523   233764 makandre@ca.ibm.com - Andrew Mak, Top down EJB preference not respected
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-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.ws.internal.common.ResourceUtils;
-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.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.ws.internal.ui.utils.AdapterUtils;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IStructuredSelection initialSelection_;
-  private int serviceGeneration_;
-  private boolean developService_;
-  private boolean assembleService_;
-  private boolean deployService_;
-  
-  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)
-    {
-      String preferred = typeIds[0];	// default to first entry initially
-      for (String typeId : typeIds) {
-    	  if (typeId.equals(type)) {
-    		  preferred = typeId;
-    		  break;
-    	  }
-      }
-      typeRuntimeServer_.setTypeId(preferred);
-  } else {
-	  if (initialSelection_ != null && !initialSelection_.isEmpty())
-	  { 
-		  Object initialObject = initialSelection_.getFirstElement(); 
-		  // initialObject would not be null since !initialSelection_.isEmpty()
-		  boolean hasAdapter = AdapterUtils.hasAdapter(initialObject);
-		  if (hasAdapter) {
-			  String entry = null;
-			  String prefix = WebServiceScenario.TOPDOWN + "/";
-			  if (type.startsWith(prefix))
-				  entry = type;
-			  else {
-				  StringBuffer entrybuff = new StringBuffer();
-				  entrybuff.append(prefix);
-				  entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
-				  entry = entrybuff.toString();
-			  }
-			  typeRuntimeServer_.setTypeId(entry);
-		  }
-	  }
-  }
-    
-    serviceGeneration_ = getScenarioContext().getGenerateWebService();
-    	
-	developService_ = serviceGeneration_ <= ScenarioContext.WS_DEVELOP;
-	assembleService_ = serviceGeneration_ <= ScenarioContext.WS_ASSEMBLE;
-	deployService_ = serviceGeneration_ <= ScenarioContext.WS_DEPLOY;
-    
-	defaultClientScale();
-	
-    return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    initialSelection_ = selection;
-  }
-  
-  public IStructuredSelection getInitialSelection()
-  {
-    return initialSelection_ ;
-  }
-  
-  IProject project_;  
-  
-  public IProject getInitialProject()
-  {
-	  if (project_==null)
-	  {
-	    project_ = getProjectFromObjectSelection(initialSelection_);
-	  }  
-	  
-	  return project_;
-  }
-  
-  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)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public Boolean getInstallService()
-  {
-    return new Boolean( getScenarioContext().getInstallWebService() );  
-  }
-  
-  public Boolean getStartService()
-  {
-    return new Boolean( getScenarioContext().getStartWebService() );  
-  }
-  
-  public Boolean getTestService()
-  {
-    return new Boolean( getScenarioContext().getTestWebService() );  
-  }
-  
-  public Boolean getPublishService()
-  {
-    return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
-  }
-
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( getScenarioContext().getGenerateProxy() );  
-  }
-  
-  public boolean getRunTestClient()
-  {
-    return  getScenarioContext().isLaunchSampleEnabled();  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(getScenarioContext().getMonitorWebService());
-  }
-  
-  public int getServiceGeneration()
-  {
-	  return serviceGeneration_;
-  }
-  
-  public int getClientGeneration()
-  {
-	  return getScenarioContext().getGenerateClient();
-  }
-  
-  public boolean getDevelopService() {
-	  return developService_;
-  }
-  
-  public boolean getAssembleService() {
-	  return assembleService_;
-  }
-  
-  public boolean getDeployService() {
-	  return deployService_;
-  }
-  
-}
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 6252ca6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,181 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060727   144354 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-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           testClient_;
-  private boolean           runTestClient_;
-  private boolean           publishService_;
-  private boolean           generateProxy_;
-  private boolean           developService_;
-  private boolean           assembleService_;
-  private boolean           deployService_; 
-  
-	private ResourceContext   resourceContext_;
-	private IStructuredSelection selection_; 
-    
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public boolean getInstallService()
-  {
-    return installService_;  
-  }
-
-  public boolean getStartService()
-  {
-    return startService_;  
-  }
-
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-  
-  public boolean getRunTestClient()
-  {
-    return runTestClient_;
-  }
-  
-  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 testService_ The testService_ to set.
-   */
-  public void setRunTestClient(boolean runTestClient_)
-  {
-    this.runTestClient_ = runTestClient_;
-  }
-  
-  /**
-   * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
-   */
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
-  {
-    this.typeRuntimeServer_ = typeRuntimeServer_;
-  }
-	
-	public void setResourceContext(ResourceContext rc)
-	{
-		resourceContext_ = rc;
-	}
-	
-	public void setObjectSelection(IStructuredSelection selection)
-	{
-	   selection_ = selection;	
-	}	
-	
-	public IStructuredSelection getObjectSelection()
-	{
-	   return selection_;
-	}
-	
-	public boolean getDevelopService() {
-		return developService_;
-	}
-
-	public void setDevelopService(boolean developService) {
-		this.developService_ = developService;
-	}	
-	
-	public boolean getAssembleService() {
-		return assembleService_;
-	}
-
-	public void setAssembleService(boolean assembleService) {
-		this.assembleService_ = assembleService;
-	}
-
-	public boolean getDeployService() {
-		return deployService_;
-	}
-
-	public void setDeployService(boolean deployService) {
-		this.deployService_ = deployService;
-	}
-
-	public boolean getTestClient() {
-		return testClient_;
-	}
-
-	public void setTestClient(boolean testClient_) {
-		this.testClient_ = testClient_;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
deleted file mode 100644
index fd210a0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServiceImplSelectionDialog.java
+++ /dev/null
@@ -1,105 +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
- * -------- -------- -----------------------------------------------------------
- * 20060410   135441 joan@ca.ibm.com - Joan Haggarty
- * 20060418   136335 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-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.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.AbstractSelectionDialog;
-import org.eclipse.wst.command.internal.env.ui.widgets.PageInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class ServiceImplSelectionDialog extends AbstractSelectionDialog {
-
-	TypeRuntimeServer trs_;
-	String titleText_;
-	IStructuredSelection selection_;
-	
-	public ServiceImplSelectionDialog(Shell parent, PageInfo pageInfo) {
-		super(parent, pageInfo);
-		titleText_ = pageInfo.getPageName();
-	}
-	
-	protected void callSetters()
-	{		
-		((ObjectSelectionWidget)getWidget()).setTypeRuntimeServer(trs_);
-		((ObjectSelectionWidget)getWidget()).setInitialSelection(selection_);
-	}
-	
-	public void setTypeRuntimeServer(TypeRuntimeServer trs)
-	{
-		trs_ = trs; 
-		
-		// set dialog title text based on the web service scenario
-		if (trs != null)
-		{
-		   String typeId = trs.getTypeId();
-		   int scenario = WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(typeId);
-		   
-		   if (scenario == WebServiceScenario.BOTTOMUP)
-		   {
-			  titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_IMPL_SELECTION;
-		   }
-		   else if (scenario == WebServiceScenario.TOPDOWN)
-		   {
-			   titleText_ = ConsumptionUIMessages.DIALOG_TITILE_SERVICE_DEF_SELECTION;
-		   }
-		}             	   
-	}
-	 
-	  protected void setShellStyle(int newShellStyle)
-	  {
-	    super.setShellStyle( newShellStyle | SWT.RESIZE );  
-	  }
-
-	  protected void configureShell(Shell newShell)
-	  {
-	    newShell.setText(titleText_);   
-	    super.configureShell(newShell);
-	  }
-
-	  public String getDisplayableSelectionString() {
-		  
-		 return ((ObjectSelectionWidget)getWidget()).getObjectSelectionDisplayableString();
-	}
-	  
-	  public IStructuredSelection getObjectSelection() {
-		  return ((ObjectSelectionWidget)getWidget()).getObjectSelection();
-	}
-	  
-	  public IProject getProject(){
-		  return ((ObjectSelectionWidget)getWidget()).getProject();
-	  }
-	  
-	  public String getComponentName(){
-		  return ((ObjectSelectionWidget)getWidget()).getComponentName();  
-	  }
-	  
-	  public void setInitialSelection(IStructuredSelection selection)
-	  {
-		  selection_ = selection; 
-	  }
-	  
-	  protected Point getInitialSize()
-	  {	
-		  return ((ObjectSelectionWidget)getWidget()).getWidgetSize();	    
-	  }
-}
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 d0067a5..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-        }
-      }
-    );
-  }
-}
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 6d0f38e..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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)
-  {
-  }
-}
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 cc92849..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,652 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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           
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060407   135415 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060410   135562 joan@ca.ibm.com - Joan Haggarty
- * 20060417   136391 joan@ca.ibm.com - Joan Haggarty
- * 20060425   138052 kathy@ca.ibm.com - Kathy Chan
- * 20060524   142635 gilberta@ca.ibm.com - Gilbert Andrews
- * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
- * 20060530   144358 kathy@ca.ibm.com - Kathy Chan
- * 20060608   145529 kathy@ca.ibm.com - Kathy Chan
- * 20060609    86421 kathy@ca.ibm.com - Kathy Chan
- * 20060727   144354 kathy@ca.ibm.com - Kathy Chan
- * 20060728   145426 kathy@ca.ibm.com - Kathy Chan
- * 20060810   135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
- * 20070502   180304 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071031   140518 joan@ca.ibm.com - Joan Haggarty
- * 20071218	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080416   215084 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080506   227848 makandre@ca.ibm.com - Andrew Mak, Disabled "Run on Server" checkbox is in checked state
- * 20080729   241275 ericdp@ca.ibm.com - Eric D. Peters, No Validation error generating Web Service client if dialog hidden
- *******************************************************************************/
-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.ComputeProxyEndpointCommand;
-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.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.common.ScenarioCleanupCommand;
-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.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.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.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;
-import org.eclipse.wst.ws.internal.ui.command.OpenEditorCommand;
-
-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(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceGeneration", 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, "MonitorService", ComputeProxyEndpointCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);    
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientGeneration", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);    
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject", 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, "MonitorService", ComputeProxyEndpointCommand.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);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ObjectSelection", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "DevelopService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "DeployService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "StartClient", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "TestClient", ServerWizardWidgetOutputCommand.class);
-        
-    // Before ObjectSelectionWidget    
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    
-	dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientFragment.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);    
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
-                
-    // After ServerWizardWidget  
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceRuntimeId", ServerExtensionDefaultingCommand.class);    
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientRuntimeId", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceComponentType", ServerExtensionDefaultingCommand.class);        
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-
-    // Map fragments that depend on data.   
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-    
-    // CreateMonitorCommand
-    dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeProxyEndpointCommand.class);
-    
-    // ComputeEndpointCommand
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ComputeProxyEndpointCommand.class);
-    
-    //  ComputeProxyEndpointCommand
-    dataRegistry.addMapping(ComputeProxyEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-    
-    // 145426
-    dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyEndpoint", ComputeProxyEndpointCommand.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);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunTestClient",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, "RunTestClient",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_SERVICE,
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ServerWizardWidget( true, false );
-				          }
-				        } );
-
-    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, "DevelopClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "AssembleClient", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "DeployClient", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "InstallClient", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "StartClient", 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( new ObjectSelectionOutputCommand(), ""));
-      add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));  
-      add( new SimpleFragment( "ServerWizardWidget" ) );
-      add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
-      add( new ServiceRootFragment() );
-      add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-      add(new SimpleFragment(new CreateMonitorCommand(), ""));
-      add(new SimpleFragment(new ComputeEndpointCommand(), ""));
-      add( new ServiceTestFragment( "TestService") );
-      add( new ClientFragment() );
-      add( new SimpleFragment(new TestDefaultingFragment(),"")); 
-      add( new SimpleFragment(new ComputeProxyEndpointCommand(), ""));
-      add( new ClientTestFragment( "ClientTestWidget") );
-      add( new SimpleFragment( "Publish") );
-      add(publishToPrivateUDDICmdFrag);
-      add( new SimpleFragment( new OpenEditorCommand(), "") );
-      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 );            
-
-      // Map ServerWizardWidgetDefaultingCommand to ObjectSelectionOutputCommand
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionOutputCommand.class, "TypeRuntimeServer", null);
-      
-      // Map ServerWizardWidgetDefaultingCommand to ServerWizardWidgetOutputCommand
-      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, "DevelopService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DevelopClient", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "AssembleClient", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "DeployClient", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartClient", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestClient", 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, "RunTestClient", 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(ServerWizardWidgetDefaultingCommand.class, "InitialProject", ServerRuntimeSelectionWidgetDefaultingCommand.class); 
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class); // KSC
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployService", ServerExtensionDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "InstallClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DevelopClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "AssembleClient", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "DeployClient", ClientExtensionDefaultingCommand.class);
-
-      
-      //Map ObjectSelectionOutputCommand to ServerRuntimeSelectionWidgetDefaultingCommand
-      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);      
-
-      //Map ObjectSelectionOutputCommand to ServerWizardWidgetOutputCommand
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerWizardWidgetOutputCommand.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, "InitialProject", PreServiceDevelopCommand.class );
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.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, "MonitorService", ServerExtensionDefaultingCommand.class);  
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.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);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerExtensionDefaultingCommand.class, "InitialProject", null);
-	  
-	    // Setup the PreServiceDevelopCommand.
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DevelopService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "AssembleService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "DeployService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "InstallService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "StartService", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "TestService", PreServiceDevelopCommand.class);    
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "PublishService", PreServiceDevelopCommand.class);
-      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-		
-	  //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( 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, "CanRunTestClient", ClientTestWidget.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "CanRunTestClient", ClientTestDelegateCommand.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "RunTestClient", 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, "RunTestClient",ClientTestDelegateCommand.class); 
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "RunTestClient", ClientTestDelegateCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", ClientExtensionDefaultingCommand.class, "TestService", null);
-   	  dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestClient", TestDefaultingFragment.class, "GenerateProxy", null);
-   	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", TestDefaultingFragment.class, "GenerateProxy", null);
-   	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntimeId", TestDefaultingFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class, "GenerateProxy", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", FinishTestFragment.class, "GenerateProxy", null);
-
-      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, "CanGenerateProxy", ClientTestFragment.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 OpenEditorCommand
-      dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", OpenEditorCommand.class );
-      dataRegistry.addMapping( PreServiceDevelopCommand.class, "Context",    OpenEditorCommand.class );      
-      
-      //Map Finish Command 
-      
-      
-    }
-  }
-}
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 5b6d555..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060227   124392 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060315   131963 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060418   129688 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   126780 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060427   138058 joan@ca.ibm.com - Joan Haggarty
- * 20060523   133714 joan@ca.ibm.com - Joan Haggarty
- * 20060525   143843 joan@ca.ibm.com - Joan Haggarty
- * 20060905   156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
- * 20070319	  159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks
- * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080326   171705 trungha@ca.ibm.com - Trung, improve AntTask errors report
- * 20080326   221364 kathy@ca.ibm.com - Kathy Chan
- * 20080402   225032 makandre@ca.ibm.com - Andrew Mak
- * 20080527   234226 kathy@ca.ibm.com - Kathy Chan
- * 20080730   242611 zhang@ca.ibm.com - Peter Moogk
- * 20080925   242312 ericdp@ca.ibm.com - Eric D. Peters, Cannot create BUJB WS from Bean in Java project using ANT tasks
- *******************************************************************************/
-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.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.ILog;
-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.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.common.DefaultingUtils;
-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.RuntimeDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceRuntimeDescriptor;
-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.WSUIPluginMessages;
-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.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.wsrt.WebServiceScenario;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{	
-  private boolean           generateProxy_=true; //jvh
-  
-  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();
-  }
-  
-  
-  /**
-   * Defaults the following bits of information in the following order:
-   * serviceRuntimeId_ : the serviceRuntimeId. Must be defaulted to non-empty String.
-   * serviceIds_.runtimeId_: the Web service runtime id. Must be defaulted to non-empty String.
-   * serviceProjectName_ : the name of the service project. Must be non-empty. May or may not exist.
-   * serviceComponentType_: the id of the service project template. Must be empty if the service
-   *                        project exists. Must be non-empty of the service project does not exist.
-   * serviceIds_.serverId_: the server type id. May be an empty String if the defaulted Web service runtime
-   *                        does not require a server.
-   * serviceIds_.serverInstanceId_: the server id. May be null or an empty String.
-   * serviceNeedEAR_: true if an EAR is needed. False otherwise.
-   * serviceEarProjectName_: the service EAR project. Must be empty if the serviceNeedEAR_ is false.
-   *                         Must be non-empty if the serviceNeedEAR_ is true.
-   * Defaults the parallel information on the client-side if needed 
-   * (@see ClientRuntimeSelectionWidgetDefaultingCommand#execute).                                                 
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IEnvironment env = getEnvironment();
-    
-    try
-    {    	
-     
-     //**Step 1** Default the serviceRuntime and the Web service runtime.
-     //serviceIdsFixed_ is set to true for the Ant scenario. It's always false for the wizard
-     //scenarios.    	
-     if (serviceIdsFixed_)
-     {
-       //Set the serviceRuntime based on the runtime and server.
-       //If user set a service project use that as initial project otherwise default from initial selection.
-       //(above is true for all scenarios except BUJ from Java Project- for BUJ from Java Project need to create a dependancy in downstream commands
-       //between the initial project and the service project so don't use as the initial selection        
-    	 if (serviceProjectName_ != null) 
-    	 {
-    	 	 IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
-    	 	 //use the user provided service project to define the runtime triplet (if user provided service project is not valid for
-    	 	 //the web service type, the runtime triplet will contain a suitable project if one exists)
-    	 	 DefaultRuntimeTriplet drt = getDefaultRuntime(serviceProject, serviceIds_.getTypeId(), false, serviceIds_.getServerId());
-    		 if (!(WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP &&
-    		    		FacetUtils.isJavaProject(initialProject_))){
-    		     //user set a service project, use as initial project
-    			 //initialProject_ is the project where the selected object resides, set to be the service project for now for all scenarios except BUJ from Java Project (for 
-    			 //BUJ from Java Project need to create a dependancy in downstream commands between the initial project and the service project)
-    			 initialProject_ = serviceProject;
-    		 }
-    		 serviceFacetMatcher_ = drt.getFacetMatcher();
-   			 serviceProjectName_ = drt.getProjectName(); //a suitable service project for the web service type, or null if a suitable project does not exist
-    	     serviceRuntimeId_ = drt.getRuntimeId();       
-
-    	       if (serviceRuntimeId_ != null)
-    	       {
-    	    	   serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
-    	      	         .getId());
-    	       }
-    	 }
-    	 else
-    	 {
-    		 DefaultRuntimeTriplet drt = getDefaultServiceRuntimeForFixedRuntimeAndServer(initialProject_, serviceIds_.getServerId());  
-    	     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, serviceIds_.getServerId());
-       if (drt.getProjectName() == null && initialProject_ != null
-    	   && WebServiceRuntimeExtensionUtils2.getScenarioFromTypeId(serviceIds_.getTypeId()) == WebServiceScenario.BOTTOMUP
-    	   && WebServiceRuntimeExtensionUtils2.getWebServiceImplIdFromTypeId(serviceIds_.getTypeId()).equals("org.eclipse.jst.ws.wsImpl.ejb") )
-       {
-    	   drt.setProjectName(initialProject_.getName());
-       }
-       serviceFacetMatcher_ = drt.getFacetMatcher();
-       serviceProjectName_ = drt.getProjectName();
-       serviceRuntimeId_ = drt.getRuntimeId();       
-
-       if (serviceRuntimeId_ != null)
-       {
-    	   serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceRuntimeId_).getRuntime()
-    		         .getId()); 
-       } 
-     }
-     
-     //**Step 2** Default the service project if it was not already defaulted 
-     //as part of defaulting the Web service runtime.
-     if (serviceProjectName_ == null)
-     {
-       // Project name did not get set when the runtime was set, so set it now
-       serviceProjectName_ = getDefaultServiceProjectName();
-     }
-
-     //**Step 3** Default the service project type.
-     IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_); 
-     if (!serviceProject.exists())
-     {
-       // Set the project template
-       serviceComponentType_ = getDefaultServiceProjectTemplate();
-     }
-     else
-     {
-       //Set it to an empty String
-       serviceComponentType_ = "";
-     }
-     //**Step 4** Default the server if this is not an Ant scenario.
-     if (!serviceIdsFixed_)
-     {
-       // Set the server
-       IStatus serverStatus = setServiceDefaultServer();
-       if (serverStatus.getSeverity() == Status.ERROR)
-       {
-         env.getStatusHandler().reportError(serverStatus);
-         return serverStatus;
-       }
-     }
-     
-     //**Step 5** Default clientNeedEAR and client EAR if an EAR is needed
-     setDefaultServiceEarProject();
-     
-     // jvh - for now comment out generate proxy
-     //   need to look at defaulting based on an event
-     //    on page 1 - when client generation goes from none
-     //    to develop...
-     /*if (generateProxy_)
-     {*/
-    	 //Default the client-side.
-    	 IStatus clientSideStatus = defaultClientSide(monitor);
-         if (clientSideStatus.getSeverity() == Status.ERROR)
-         {
-           return clientSideStatus;
-         }                  
-    // }
-          
-     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);
-      
-      // If the exception has no error msg, it's kind of useless to the user so let's log it
-      if ( e.getMessage() == null){
-      	ILog pluginlog = WebServiceConsumptionUIPlugin.getInstance().getLog();
-      	pluginlog.log(errorStatus);
-      	  
-      	// create a new IStatus which has a non-null msg, this is to be thrown to the user.
-      	errorStatus = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_TASK_EXCEPTED,
-    	          new String[] { WSUIPluginMessages.MSG_SEE_ERROR_LOG }), e);  
-      }
-        
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-  }
-
-  private IStatus defaultClientSide(IProgressMonitor monitor)
-  {
-    IStatus clientDefaultFromServiceStatus = defaultClientSideFromServiceSide(serviceProjectName_, serviceIds_, serviceNeedEAR_, serviceEarProjectName_);
-
-    // If an error status is returned, the only property that was set on 
-    // ClientRuntimeSelectionWidgetDefaultingCommand is clientProjectName_. 
-    // The rest of the properties including clientRuntimeId_, clientComponentType_, 
-    // all the values in clientIds_, clientNeedEAR_, and clientEarProjectName_ 
-    // have not been set because the service side server and
-    // web service runtime could not be used on the client side. Run the entire
-    // client-side defaulting algorithm using clientProjectName_ as the 
-    // clientInitialProject_. Then update the clientEarProjectName_ based on the
-    // service side EAR.
-    if (clientDefaultFromServiceStatus.getSeverity() == IStatus.ERROR)
-    {
-      // 1. Run client side defaulting from scratch with clientInitialProject_
-      // set to the new clientProjectName_.
-      IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getClientProjectName());
-      setClientInitialProject(clientProject);
-      IStatus clientExecuteStatus = super.execute(monitor, null);
-      if (clientExecuteStatus.getSeverity() == Status.ERROR)
-      {
-        return clientExecuteStatus;
-      }
-
-      // 2. Update the client-side EAR if serviceNeedEAR_ is true;
-      if (serviceNeedEAR_)
-      {
-        defaultClientEarFromServiceEar(serviceProjectName_, serviceEarProjectName_);
-      }
-    }
-    
-    return Status.OK_STATUS;
-	  
-  }
-  
-  private void setDefaultServiceEarProject()
-  {
-    //Don't need an ear if this is a Java project, or if the selected template is jst.utility
-    IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().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;
-          }
-        }
-      } else { // serverId == null, assume that it does not need EAR
-    	  serviceNeedEAR_ = false;
-      }
-    }
-    
-    if (serviceNeedEAR_)
-    {
-      serviceEarProjectName_ = DefaultingUtils.getDefaultEARProjectName(serviceProjectName_);
-    }
-    else
-    {
-      serviceEarProjectName_ = "";
-    }   
-  }
-  
-  private IStatus setServiceDefaultServer()
-  {
-    //Choose an existing server the module is already associated with if possible
-    IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
-    IServer[] configuredServers = null;
-    if(serviceProject.exists())
-    	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.
-    RuntimeDescriptor runtimeDescriptor = WebServiceRuntimeExtensionUtils2.getRuntimeById(serviceIds_.getRuntimeId());
-    if (runtimeDescriptor.getServerRequired())
-    {    
-      String runtimeLabel = WebServiceRuntimeExtensionUtils2.getRuntimeLabelById(serviceIds_.getRuntimeId());    
-      IStatus status = StatusUtils.errorStatus(NLS.bind(ConsumptionUIMessages.MSG_ERROR_NO_SERVER_RUNTIME, new String[]{runtimeLabel}) );
-      return status;
-    }
-    
-    return Status.OK_STATUS;
-  }  
-  
-  private IServer getServerFromServiceRuntimeId()
-  {
-    IServer[] servers = ServerCore.getServers();
-    if (servers != null && servers.length > 0) 
-    {
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String preferredServerFactoryId = context.getServerFactoryId();
-
-      //If a server of the preferred server type is present, check that one first
-      for (int j = 0; j < servers.length; j++)
-      {
-    	if (servers[j] != null && servers[j].getServerType() != null)
-    	{
-	        String serverFactoryId = servers[j].getServerType().getId();
-	        if (serverFactoryId.equals(preferredServerFactoryId))
-	        {
-	          if (WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportServer(serviceRuntimeId_, serverFactoryId))
-	          {
-	            return servers[j];
-	          }
-	        }  
-    	}
-      }
-      
-      //A server of the preferred server type could not be found or did not match. Check all the existing servers.    
-      for (int i = 0; i < servers.length; i++)
-      {
-    	if (servers[i] != null && servers[i].getServerType() != null)
-    	{
-	        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 String getDefaultServiceProjectTemplate()
-  {
-    String[] templates = WebServiceRuntimeExtensionUtils2.getServiceProjectTemplates(serviceIds_.getTypeId(), serviceIds_.getRuntimeId());    
-    
-    //Walk the list of service project types in the project topology preference
-    ProjectTopologyContext ptc= WebServiceConsumptionUIPlugin.getInstance().getProjectTopologyContext();
-    String[] preferredTemplateIds = ptc.getServiceTypes();
-    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.doesServiceRuntimeSupportTemplate(serviceRuntimeId_, templateId);
-          if (matches)
-          {
-            return templates[i];
-          }
-        }
-      }
-    }
-    
-    //Since the preferredTemplateIds contains the union of all project types for all service runtimes, we are
-    //guaranteed to have returned by now, so the code below will never be executed under normal
-    //circumstances. Just return something to satisfy the compiler.
-    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 runtimePreferredServer)
-  {
-    String[] serviceRuntimes = WebServiceRuntimeExtensionUtils2.getServiceRuntimesByServiceType(serviceIds_.getTypeId(), runtimePreferredServer);
-    ArrayList<String> validServiceRuntimes = new ArrayList<String>();
-    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, serviceIds_.getServerId());
-    }
-  }
-  
-
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-  }
-  
-  public void setInitialProject(IProject initialProject)
-  {
-    initialProject_ = initialProject;
-  }
-  
-  public IProject getInitialProject()
-  {
-    return 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_;
-  }
-  
-  // This is for the Ant scenario where the service project name can be set in the property file.
-  // If the user has set the ServiceProjectName use it for defaulting purposes
-  public void setServiceProjectName(String name)
-  {
-	  serviceProjectName_ = name;
-  }
-  
-}
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 9b6df88..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 730e153..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 4f186f1..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 9d1d6af..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<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 5e01b0f..0000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index 6414517..0000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.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.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 4165159..0000000
--- a/bundles/org.eclipse.jst.ws/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Wed Oct 01 07:20:02 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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=error
-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=error
-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.5
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 2bcc8c9..0000000
--- 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 eeb12b7..0000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 1.0.308.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal;x-internal:=true,
- org.eclipse.jst.ws.internal.command;x-internal:=true,
- org.eclipse.jst.ws.internal.common;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance;x-internal:=true,
- org.eclipse.jst.ws.internal.conformance.rules;x-internal:=true,
- org.eclipse.jst.ws.internal.context;x-internal:=true,
- org.eclipse.jst.ws.internal.data;x-internal:=true,
- org.eclipse.jst.ws.internal.dialog;x-internal:=true,
- org.eclipse.jst.ws.internal.ext;x-internal:=true,
- org.eclipse.jst.ws.internal.ext.test;x-internal:=true,
- org.eclipse.jst.ws.internal.plugin;x-internal:=true,
- org.eclipse.jst.ws.internal.wsrt
-Require-Bundle: org.eclipse.wst.command.env;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.101,1.1.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.jst.ws/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index 2d5936b..0000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-src.includes = component.xml
-bin.includes = .,\
-               META-INF/,\
-               about.html,\
-               plugin.properties
-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 a90bf17..0000000
--- 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 505a8be..0000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/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 4aaa75e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPlugin.properties
+++ /dev/null
@@ -1,31 +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
-###############################################################################
-
-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.
-
-MSG_JAXRPC11_NOT_COMPLIANT=The service class "{0}" does not comply to one or more requirements of the JAX-RPC 1.1 specification, and may not deploy or function correctly.
-MSG_JAXRPC11_UNRESOLVED_CLASS=The class "{0}" cannot be loaded via project "{1}". Check that the project contains the class, or that the class is loadable according to the Java Build Path of the project.
-MSG_JAXRPC11_UNRESOLVED_TYPE=A data type, "{0}", could not be resolved while analyzing the service class. Check your project classpath.
-MSG_JAXRPC11_RULE_0001=The service class "{0}" does not have a public default constructor. Chapter 10.1 of the JAX-RPC 1.1 specification requires a service class to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the service class to handle an incoming request message. 
-MSG_JAXRPC11_RULE_0002=The value type "{0}" used via the service class "{1}" does not have a public default constructor. Chapter 5.4 of the JAX-RPC 1.1 specification requires a value type to have a public default constructor, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the value type during deserialization.
-MSG_JAXRPC11_RULE_0003=The method "{0}" on the service class "{1}" is overloaded. Overloaded methods are allowed by chapter 5.5.5 of the JAX-RPC 1.1 specification, however, some JAX-RPC 1.1 compliant tools may not allow overloaded methods or may generate WSDL with overloaded operations as contrary to rule R2304 of the WS-I Basic Profile.
-MSG_JAXRPC11_RULE_0004=The service specific exception class "{0}" does not have a public constructor with parameters corresponding in number and type to the getter methods on the class. Chapter 5.5.5 of the JAX-RPC 1.1 specification requires a service specific exception to have a public constructor with the same number of parameters as there are getter methods, and of matching data types, otherwise a JAX-RPC 1.1 compliant Web service engine may be unable to construct an instance of the exception during deserialization of a fault message.
-MSG_JAXRPC11_RULE_0005=The method "{0}" on the service class "{1}" uses a data type, "{2}", that is not supported by the JAX-RPC specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0006=The field or property "{0}" on the value type "{1}" used via the service class "{2}" has a data type, "{3}", that is not supported by the JAX-RPC 1.1 specification. Instances of the type may not serialize or deserialize correctly. Loss of data or complete failure of the Web service may result.
-MSG_JAXRPC11_RULE_0007=The primitive type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported primitive types are "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0008=The wrapper type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.1 of the specification, the supported wrapper types are those corresponding to "boolean", "byte", "short", "int", "long", "float" and "double".
-MSG_JAXRPC11_RULE_0009=The Java type "{0}" is not supported by the JAX-RPC 1.1 specification. As stated in chapter 5.1.3 of the specification, the supported standard types are "java.lang.String", "java.util.Date", "java.util.Calendar", "java.math.BigInteger", "java.math.BigDecimal", "javax.xml.namespace.QName" and "java.net.URI".
-MSG_JAXRPC11_RULE_0010=Support for collection and map classes such as "{0}" is not required by JAX-RPC 1.1. Due to their non-type safe nature, a JAX-RPC 1.1 compliant Web service engine may not handle collections, or may represent them in WSDL documents and SOAP messages in a manner that impairs interoperability. The use of arrays instead of collections is strongly recommended.
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 b295793..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/WSPluginMessages.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060420   132905 cbrealey@ca.ibm.com - Chris Brealey          
- * 20060607   145604 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-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;
-	public static String MSG_JAXRPC11_NOT_COMPLIANT;
-	public static String MSG_JAXRPC11_UNRESOLVED_CLASS;
-	public static String MSG_JAXRPC11_UNRESOLVED_TYPE;
-	public static String MSG_JAXRPC11_RULE_0001;
-	public static String MSG_JAXRPC11_RULE_0002;
-	public static String MSG_JAXRPC11_RULE_0003;
-	public static String MSG_JAXRPC11_RULE_0004;
-	public static String MSG_JAXRPC11_RULE_0005;
-	public static String MSG_JAXRPC11_RULE_0006;
-	public static String MSG_JAXRPC11_RULE_0007;
-	public static String MSG_JAXRPC11_RULE_0008;
-	public static String MSG_JAXRPC11_RULE_0009;
-	public static String MSG_JAXRPC11_RULE_0010;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, WSPluginMessages.class);
-	}
-}
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 45ab7d8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,61 +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.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 c4ac802..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,37 +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.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * reports the contents of the given status object.
-  * Subclasses must implement this method to report
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public int reportStatus(IStatus status, Vector options);
-  public boolean reportStatus(IStatus status);
-  public void dumpSavedStatus();
-  public boolean canContinue();
-  public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Renders the contents of the given status object.
-  * Subclasses must implement this method to render
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index 95a8f16..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,82 +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.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 86876fa..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
+++ /dev/null
@@ -1,86 +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.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 10061e5..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 f7da25f..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060222   125574 zina@ca.ibm.com - Zina Mostafia
- * 20060222   225574 gilberta@ca.ibm.com - Gilbert Andrews
- * 20090310   242440 yenlu@ca.ibm.com - Yen Lu, Pluggable IFile to URI Converter
- *******************************************************************************/
-/*
- * 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.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.ws.internal.converter.IIFile2UriConverter;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-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 {
-	 	  
-  private static String getConvertedURIFromIFile(IFile file,String defaultURI)
-  {
-	String convertedLocation = null;
-	boolean allowBaseConversionOnFailure = true;
-	if (file != null && file.exists())
-	{	
-	  IIFile2UriConverter converter = WSPlugin.getInstance().getIFile2UriConverter();
-	  if (converter != null)
-	  {
-		convertedLocation = converter.convert(file);
-		allowBaseConversionOnFailure = converter.allowBaseConversionOnFailure();
-	  }
-	}
-	if (convertedLocation == null && allowBaseConversionOnFailure)
-	  return defaultURI;
-	return convertedLocation;
-  }
-  
-  private static String getConvertedURIFromURI(String originalURI)
-  {
-	IFile file = null;
-    if (originalURI != null)
-	{
-	  String platformResource = "platform:/resource";
-	  if (originalURI.startsWith(platformResource))
-	    file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(originalURI.substring(platformResource.length())));
-	  else if (originalURI.startsWith("file:"))
-	  {
-		String filePath = convertToRelative(originalURI);
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-	  }
-	}
-    return getConvertedURIFromIFile(file,originalURI);
-  }
-  
-  public static String getWSDLURI(ServiceImpl serviceImpl)
-  {
-  	Definition definition = serviceImpl.getEnclosingDefinition();
-  	String location = definition.getLocation();
-  	return getConvertedURIFromURI(location);
-  }
-   
-  //has to be under the webcontent
-  public static final String EJB_MODULE = "ejbModule";
-  public static final String APPCLIENT_MODULE = "appClientModule";
-  public static final String WEB_MODULE = "WebContent";
-
-  public static String getWSDLURI(ServiceRef serviceImpl)
-  {
-  	 String moduleRoot = null;
-	 IProject project = ProjectUtilities.getProject(serviceImpl);
-	 if(J2EEUtils.isWebComponent(project))
-	 {
-	   moduleRoot = WEB_MODULE;
-	 }
-     else if (J2EEUtils.isEJBComponent(project))
-	 {
-	   moduleRoot = EJB_MODULE;
-	 }
-	 else if (J2EEUtils.isAppClientComponent(project))
-	 {
-	   moduleRoot = APPCLIENT_MODULE;
-	 }
-
-	 if (moduleRoot != null)
-	 {
-	   IPath path = project.getLocation().addTrailingSeparator();
-	   path = path.append(moduleRoot).addTrailingSeparator();
-	   path = path.append(serviceImpl.getWsdlFile());
-	   File file = new File(path.toString());
-	   try {
-	     URL url = file.toURL();
-	     return getConvertedURIFromURI(url.toString());
-	   }
-	   catch(MalformedURLException e) {		   
-	   }
-	 }
-	 return null;
- }
-  
-  public static String getWSDLURI(WSDLResourceImpl wsdlRI)
-  {
-  	Definition definition = wsdlRI.getDefinition();
-  	String location = definition.getLocation();
-  	return getConvertedURIFromURI(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 b5dbfcd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1713 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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     
- * 20060329   128069 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060503   126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060524   131132 mahutch@ca.ibm.com - Mark Hutchinson
- * 20070723   194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
- * 20071218	  200193 gilberta@ca.ibm.com - Gilbert Andrews
- * 20071221   213726 kathy@ca.ibm.com - Kathy Chan
- * 20070123   216345 gilberta@ca.ibm.com - Gilbert Andrews
- * 20080212   208795 ericdp@ca.ibm.com - Eric Peters, WS wizard framework should support EJB 3.0
- * 20080229   218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20081001   243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
- * 20090114   261087 ericdp@ca.ibm.com - Eric D. Peters, No way to get meta-inf path for a project
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-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.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.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-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.commonarchivecore.internal.helpers.ArchiveManifest;
-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.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-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.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-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.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-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]);		
-	}
-    
-    public static IVirtualComponent[] getAllEJBComponents(){
-        List v = new ArrayList();
-        IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-        for (int i = 0; i < projects.length; i++) {
-            try {
-                IVirtualComponent[] components = getEJBComponents(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.
-	 * @deprecated use getBeanNames(IProject project)
-	 */
-	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 project- the project to find stateless session beans in
-	 * @return  Vector of bean String names.
-	 */
-	public static Vector getBeanNames(IProject project) {
-		// We currently only support Stateless session beans.
-		Vector names = new Vector();
-    	IModelProvider provider = ModelProviderManager.getModelProvider(project);
-    	Object modelObject = provider.getModelObject();
-
-    	List sessionBeans = new Vector();
-		boolean isJ2EE5 = J2EEProjectUtilities.isJEEProject(project);
-		if (isJ2EE5) {
-    		//a JEE5 project
-    		EnterpriseBeans eBeans = ((org.eclipse.jst.javaee.ejb.EJBJar)modelObject).getEnterpriseBeans();
-    		if (eBeans !=null)
-    			sessionBeans = eBeans.getSessionBeans();
-    	} else {
-    		sessionBeans = ((EJBJar)modelObject).getSessionBeans();
-    	}
-
-		Iterator iterator = sessionBeans.iterator();
-
-		while (iterator.hasNext()) {
-			Object next = (iterator.next());
-			if (next instanceof EnterpriseBean) {
-				EnterpriseBean bean = (EnterpriseBean) next;
-
-				if (bean.isSession()) {
-					Session sessionBean = (Session) bean;
-
-					if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
-						names.add(bean.getName());
-					}
-				}
-			} else {
-				SessionBean bean = (SessionBean) next;
-				if (bean.getSessionType().getValue() == SessionType.STATELESS) {
-					names.add(bean.getEjbName());
-				}
-			}
-		}
-		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 safely.
-     * @returns true if the project is a Web project, EJB project, or AppClient
-     * project that can safely be associated with the EAR project. 
-     * Returns false if the project is a Web project, 
-     * EJB project, or AppClient project that cannot be associated safely with the EAR project, and
-     * true if project is not recognized as a Web, EJB, or
-     * AppClient project, and ture if earProject is not recognized as an EAR project.
-     */
-	public static boolean canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject) {
-		  boolean toReturn = true;
-	      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 compareVersion;
-	          List<IProjectFacetVersion> supportedFacetVersionList = new ArrayList<IProjectFacetVersion>();
-	          if (isWeb)
-	          {
-	            IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
-	            IProjectFacetVersion webPfv = fProject.getInstalledVersion(webPf);
-	            supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, webPf);
-	            toReturn = false;
-	            for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
-	            	IProjectFacetVersion next = supportedFacetVersion;
-	            	compareVersion = webPfv.getVersionString();
-	            	if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) { 
-	            		toReturn = true;
-	            		break;
-	            	}
-	            }
-	            
-	          }
-	          else if (isEJB)            
-	          {
-	            IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
-	            IProjectFacetVersion ejbPfv = fProject.getInstalledVersion(ejbPf);
-	            supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, ejbPf);
-	            toReturn = false;
-	            for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
-	            	IProjectFacetVersion next = supportedFacetVersion;
-	            	compareVersion = ejbPfv.getVersionString();
-	            	if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) { 
-	            		toReturn = true;
-	            		break;
-	            	}
-	            }
-	            
-	          }
-	          else if (isAppClient)
-	          {
-	            IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
-	            IProjectFacetVersion acPfv = fProject.getInstalledVersion(acPf);
-	            supportedFacetVersionList = EarUtilities.getSupportedFacets(earPfv, acPf);
-	            toReturn = false;
-	            for (IProjectFacetVersion supportedFacetVersion : supportedFacetVersionList ) {
-	            	IProjectFacetVersion next = supportedFacetVersion;
-	            	compareVersion = acPfv.getVersionString();
-	            	if (next!= null && compareVersion!=null && compareVersion.compareTo(next.getVersionString()) == 0) { 
-	            		toReturn = true;
-	            		break;
-	            	}
-	            }
-
-	          } 
-	          
-	        } catch (Exception e)
-	        {
-	          //not much we can do here, return what we've calculated thus far
-	        }         
-	      }
-
-		
-		return toReturn;
-		
-	}
-    /**
-     * 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.
-     * @deprecated use canAssociateProjectToEARWithoutWarning(IProject project, IProject earProject)
-     */
-    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);
-		
-		//should WEB-INF location be pulled in from the .component file rather than hardcoded here?
-		IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
-		IPath modulePath = webInfDir.getWorkspaceRelativePath();
-		
-		if (!webInfDir.exists())
-		{	
-			try 
-			{	
-				webInfDir.create(0,null);				
-			}
-			catch (CoreException e)
-			{}
-		}		
-		return modulePath;
-	}
-
-	/**
-	   * @param project
-	   * @return
-	   */
-		public static IPath getMetaInfPath(IProject project){
-			
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			
-			//should META-INF location be pulled in from the .component file rather than hardcoded here?
-			IVirtualFolder metaInfDir = component.getRootFolder().getFolder(new Path("/META-INF"));
-			IPath modulePath = metaInfDir.getWorkspaceRelativePath();
-			
-			if (!metaInfDir.exists())
-			{	
-				try 
-				{	
-					metaInfDir.create(0,null);				
-				}
-				catch (CoreException e)
-				{}
-			}		
-			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.    
-              if (ResourceUtils.isJavaProject(project))
-              {
-                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];
-	}
-	
-	// 194434 - Check for non-existing EAR with contents that's not deleted previously
-	public static IStatus canCreateEAR(IProject earProject)
-    {
-		IStatus status = Status.OK_STATUS;
-		if( !earProject.exists() ){
-			IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			path = path.append(earProject.getName());
-			status = ProjectCreationDataModelProviderNew.validateExisting(earProject.getName(), path.toOSString());
-		}
-		return status;
-    }
-	
-
-	 public static void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
-	  {
-	    if (J2EEUtils.isWebComponent(project))
-	    {
-	      ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
-	      manifest.mergeClassPath(new String[]{uri});
-	      J2EEProjectUtilities.writeManifest(project, manifest);
-	      forceClasspathUpdate(project);
-	    }
-	  }
-	  
-	  public static void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
-	  {
-		  try {
-			  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
-			  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
-			  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-			  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) {
-			  
-		  }
-	  }
-	  
-	//Forcing classpath update
-	  public static void forceClasspathUpdate (IProject project) {
-		  J2EEComponentClasspathUpdater classpathUpdater = J2EEComponentClasspathUpdater.getInstance();
-		  Collection projCollection = Collections.singleton(project);
-		  classpathUpdater.forceUpdate(projCollection, true);
-		  IJobManager jm = Job.getJobManager();
-		  try{
-			  jm.join(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME, null);
-		  }catch(Exception exc){}
-	  }
-	 /**
-     * Determines the IJ2EEModuleConstants.JST_WEB_MODULE facet version that
-     * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
-     * @returns the version String for IJ2EEModuleConstants.JST_WEB_MODULE facet, if there is problem
-     * trying to determine the version, either the default version or the latest supported version
-     * will be returned
-     */
-	public static String getWebJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
-		String returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getDefaultVersion().getVersionString();
-		try {
-		returnVersion = EarUtilities.DYNAMIC_WEB_FACET.getLatestVersion().getVersionString();
-	    IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-	    IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
-	    IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
-	    IProjectFacet webPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE);
-	    returnVersion= EarUtilities.getSupportedFacets(earPfv, webPf).get(0).getVersionString();
-		} catch (Exception e) {
-			//nothing we can do here, return what we have calculated thus far
-		}
-	    return returnVersion;
-	}
-	 /**
-     * Determines the IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet version that
-     * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
-     * @returns the version String for IJ2EEModuleConstants.JST_APPCLIENT_MODULE facet, if there is problem
-     * trying to determine the version, either the default version or the latest supported version
-     * will be returned
-     */
-	public static String getAppClientJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
-		String returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getDefaultVersion().getVersionString();
-		try {
-		returnVersion = EarUtilities.APPLICATION_CLIENT_FACET.getLatestVersion().getVersionString();
-	    IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-	    IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
-	    IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
-	    IProjectFacet acPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_APPCLIENT_MODULE);
-	    returnVersion= EarUtilities.getSupportedFacets(earPfv, acPf).get(0).getVersionString();
-		} catch (Exception e) {
-			//nothing we can do here, return what we have calculated thus far
-		}
-	    return returnVersion;
-	}
-	 /**
-     * Determines the IJ2EEModuleConstants.JST_EJB_MODULE facet version that
-     * matches the IJ2EEModuleConstants.JST_EAR_MODULE facet version
-     * @returns the version String for IJ2EEModuleConstants.JST_EJB_MODULE facet, if there is problem
-     * trying to determine the version, either the default version or the latest supported version
-     * will be returned
-     */
-	public static String getEJBJ2EEVersionFromEARJ2EEVersion(IProject earProject) {
-		String returnVersion = EarUtilities.EJB_FACET.getDefaultVersion().getVersionString();
-		try {
-		returnVersion = EarUtilities.EJB_FACET.getLatestVersion().getVersionString();
-	    IFacetedProject fEarProject = ProjectFacetsManager.create(earProject);
-	    IProjectFacet earPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EAR_MODULE);
-	    IProjectFacetVersion earPfv = fEarProject.getInstalledVersion(earPf);
-	    IProjectFacet ejbPf = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_EJB_MODULE);
-	    returnVersion= EarUtilities.getSupportedFacets(earPfv, ejbPf).get(0).getVersionString();
-		} catch (Exception e) {
-			//nothing we can do here, return what we have calculated thus far
-		}
-	    return returnVersion;
-	}
-}
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 5455fdc..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,248 +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.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 d36a486..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1919 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060330   124667 kathy@ca.ibm.com - Kathy Chan
- * 20060421   136761 rsinha@ca.ibm.com - Rupam Kuehner
- * 20060424   115690 sengpl@ca.ibm.com - Seng Phung-Lu
- * 20060503   126819 rsinha@ca.ibm.com - Rupam Kuehner
- * 20080122   215866 trungha@ca.ibm.com - Trung Ha
- * 20080303   218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
- * 20080626   236645 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-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.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.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.javaee.ejb.SessionBean;
-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";
-    
-    private static final String DEFAULT_EAR_EXT = "EAR";
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
-	 * given file system relative pathname and project or null if no such resource exists.
-	 *
-	 * @param filePath File system relative pathname
-	 * @param project Project
-	 * @return The <code>IResource</code>.
-	 */
-	public static IResource findResourceAtLocation(String filePath, IProject project) {
-		
-		return findResource(findPathAtLocation( new Path(filePath), project));
-	}
-	
-	/**
-	 * This method attempts to convert a path that is relative to a file system
-	 * to a path that is relative to the workspace. Instead of comparing the
-	 * filePath with the install location of the workspace (i.e.
-	 * Platform.getLocation()), the filePath is compared with the location of the project
-	 * since the project could be in a location other than the the default location relative to the
-	 * workspace.
-	 * 
-	 * @param filePath	File path relative to a file system
-	 * @param project	The project the file is in
-	 * @return 			Path relative to the workspace
-	 */
-	public static IPath findPathAtLocation(IPath filePath, IProject project) {
-		IPath result = null;
-
-		IPath projectLocation = project.getLocation();
-
-		if (projectLocation.matchingFirstSegments(filePath) == projectLocation
-				.segmentCount()) {
-			filePath = filePath.removeFirstSegments(projectLocation
-					.segmentCount() - 1);
-			result = filePath.setDevice(null);
-		}
-
-		return result;
-	}
-	/**
-	 * 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) {
-		try
-		{
-		  return project.hasNature(JavaCore.NATURE_ID);
-		}
-		catch (CoreException ce)
-		{
-			//Return false if CoreException occurs while checking nature.
-			return false;
-		}
-	}
-
-	/**
-	 * 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());
-	}
-	
-	/**
-	 * 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.
-	 */
-	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;
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 */
-	public static IPath getWebComponentServerRootPath(IProject project){
-		
-      IContainer webModuleServerRoot = null;
-      IVirtualComponent vc = ComponentCore.createComponent(project);
-      if (vc != null && vc.exists()){
-        IContainer[] containers = J2EEProjectUtilities.getOutputContainers(project.getProject());
-        if (containers.length > 0)
-          webModuleServerRoot = containers[0];
-      }
-      
-      if (webModuleServerRoot != null) 
-    	return webModuleServerRoot.getFullPath();
-      return null;
-	}
-
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated use getWebComponentURL(..) 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;
-			} else if (obj instanceof SessionBean) {
-				SessionBean JEE5Bean = (SessionBean) obj;
-				IProject ejbProject = ProjectUtilities.getProject(JEE5Bean);
-				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;
-  }
-  
-  public static String getDefaultEARExtension() {
-	    return DEFAULT_EAR_EXT;
-	  }
-}
-
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 57e4120..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,69 +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.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 d13a8a2..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,832 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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          
- * 20060330   124667 kathy@ca.ibm.com - Kathy Chan
- * 20061004   159356 kathy@ca.ibm.com - Kathy Chan, Get correct module root URL based on server chosen
- * 20070119   159458 mahutch@ca.ibm.com - Mark Hutchinson
- * 20090518 [252077] tangg@emc.com - Gary Tang, Fail to deploy an EAR project if it contains a module
- *                   kchong@ca.ibm.com - Keith Chong, (updated patch)
- *******************************************************************************/
-
-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.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);
-}
-	/**
-	 * Find the specific module with module name in a project
-	 * @param project - the project
-	 * @param module - name of desired module
-	 * @return IModule
-	 */
-	public static IModule getModule(IProject project, String module) {
-		// If module is null, then just return the first one
-		if (module == null)
-			return getModule(project);
-		
-		IModule[] modules = ServerUtil.getModules(project);
-		int length = modules.length;
-		for (int i = 0; i < length; i++)
-		{
-			IModule aModule = modules[i];
-			if (module.equals(aModule.getName()))
-				return aModule;
-		}
-		return null;
-	}
-	
-// 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 based on a server factory ID or null if the project has no Web nature
-	 * or the module root cannot be determined (e.g. For some types of 
-	 * servers, we would not be able to get module root URL if the server has not been started).
-	 * Note that we are not relying on which server the module is currently associated with to determine
-	 * the correct module server root because the project might be associated with a server but we need the
-	 * module root based on another server factory ID.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @param serverFactoryId server factory ID
-	 * @return The web server module root URL or null 
-	 */
-	public static String getWebComponentURL(IProject project, String serverFactoryId) {
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			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];
-						IRuntimeType runtimeType = runtime.getRuntimeType();
-						if (runtimeType != null)
-						{
-							String thisRuntimeTypeId = runtimeType.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
-	 * component based on a server factory ID and server.  Returns null if the project has no Web nature
-	 * or the module root cannot be determined (e.g. For some types of 
-	 * servers, we would not be able to get module root URL if the server has not been started).
-	 * Note that we are not relying on which server the module is currently associated with to determine
-	 * the correct module server root because the project might be associated with a server but we need the
-	 * module root based on another server / server factory ID.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @param serverFactoryId server factory ID
-	 * @param server Server id
-	 * @return The web server module root URL or null 
-	 */
-	public static String getWebComponentURL(IProject project,
-			String serverFactoryId, IServer server) {
-
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			if (server != null) {
-                IURLProvider urlProvider = (IURLProvider) server.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 {
-				webProjectURL = getWebComponentURL(project, serverFactoryId);
-			}
-		}
-		return webProjectURL;
-	}
-	
-	public static String getEncodedWebComponentURL(IProject project, String serverFactoryId) {
-		String url = getWebComponentURL(project, serverFactoryId);
-		return encodeURL(url);
-	}
-	
-	public static String getEncodedWebComponentURL(IProject project, String serverFactoryId, IServer server) {
-		String url = getWebComponentURL(project, serverFactoryId, server);
-		return encodeURL(url);
-	}
-
-	public static String encodeURL(String url) {
-		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);
-			IRuntimeType runtimeType = runtime.getRuntimeType();
-			if (runtimeType != null)
-			{
-				String thisRuntimeTypeId = runtimeType.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);
-			IRuntimeType runtimeType = runtime.getRuntimeType();
-			if (runtimeType != null)
-			{
-				String thisId = runtimeType.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);
-			IRuntimeType runtimeType = runtime.getRuntimeType();
-			if (runtimeType != null)
-			{
-				String thisId = runtimeType.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];
-        IRuntimeType runtimeType = runtime.getRuntimeType();
-    	if (runtimeType != null)
-    	{
-    		String thisRuntimeTypeId = runtimeType.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 1f499b0..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,140 +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.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 da7e1da..0000000
--- 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 06067de..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2SelectionTransformer.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060222   128094 joan@ca.ibm.com - Joan Haggarty
- * 20070305   175194 makandre@ca.ibm.com - Andrew Mak, Ant task InitialSelection only allows wsdl within the workspace
- *******************************************************************************/
-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();
-		        }
-			}
-			// if selection not already set - create it from the resource object
-			if (selection == null)
-			{
-			  selection = new StructuredSelection(resource);
-			}
-		}
-		else if (value instanceof String && value.toString().indexOf(":") != -1) {
-			// remote file
-			selection = new StructuredSelection(value);
-		}
-		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 b859605..0000000
--- 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 de87fe1..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/String2TypeRuntimeServerModifier.java
+++ /dev/null
@@ -1,93 +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
- * -------- -------- -----------------------------------------------------------
- * 20060303   128832 joan@ca.ibm.com - Joan Haggarty
- *******************************************************************************/
-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 TYPE_ID = "TypeId";  //$NON-NLS-N$
-	private String TD_EJB = "TOP DOWN EJB";  //$NON-NLS-N$
-	private String BU_EJB = "BOTTOM UP EJB";  //$NON-NLS-N$
-	private String TD_EJB_TYPE_ID = "1/org.eclipse.jst.ws.wsImpl.ejb";
-	private String BU_EJB_TYPE_ID = "0/org.eclipse.jst.ws.wsImpl.ejb";
-	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);	
-			
-			//check if web service type is EJB - if not, default for Java bean types
-			String typeID = (String)typesMap.get(prefix+TYPE_ID);
-			if (typeID != null)
-			{
-				if (typeID.toUpperCase().equals(TD_EJB))  //only setting typeID specifically for EJB case
-				{
-					types.setTypeId(TD_EJB_TYPE_ID);
-				}	
-				else if (typeID.toUpperCase().equals(BU_EJB))
-				{
-					types.setTypeId(BU_EJB_TYPE_ID);
-				}	
-			}			
-		}
-  }	
-}
-
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 c1b66d8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.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.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 bb5eaa3..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,288 +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.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/conformance/IJavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
deleted file mode 100644
index 9cfe27d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaBeanProperty.java
+++ /dev/null
@@ -1,96 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object represents a simple or indexed property
- * as defined by the Java Bean specification. Every
- * IJavaBeanProperty is characterized by four things:
- * <ol>
- * <li>The name of the property.</li>
- * <li>Whether or not the property is indexed.</li>
- * <li>The JDT IMethod of the getter, if any.</li>
- * <li>The JDT IMethod of the setter, if any.</li>
- * </ol>
- */
-public interface IJavaBeanProperty
-{
-	/**
-	 * Returns the name of the property.
-	 * @return The name of the property.
-	 */
-	public String getName ();
-
-	/**
-	 * Returns true if and only if the property is indexed.
-	 * @return True if and only if the property is indexed.
-	 */
-	public boolean isIndexed ();
-
-	/**
-	 * Returns the JDT IMethod of the getter.
-	 * For indexed properties,
-	 * the return type of the getter will be an array.
-	 * For simple properties,
-	 * the return type of the getter will not be an array.
-	 * @return The JDT IMethod of the getter,
-	 * or null if this is a write-only property.
-	 */
-	public IMethod getGetter ();
-	
-	/**
-	 * Returns the JDT IMethod of the indexed getter,
-	 * or null if this is either not an indexed property,
-	 * or is an indexed property but has only the array-
-	 * based getter.
-	 * @return The JDT IMethod of the indexed getter,
-	 * or null if this is not an indexed property or
-	 * if there is no indexed getter.
-	 */
-	public IMethod getIndexedGetter ();
-
-	/**
-	 * Returns the JDT IMethod of the setter.
-	 * For indexed properties,
-	 * the parameter type of the setter will be an array.
-	 * For simple properties,
-	 * the parameter type of the setter will not be an array.
-	 * @return The JDT IMethod of the setter,
-	 * or null if this is a read-only property.
-	 */
-	public IMethod getSetter ();
-	
-	/**
-	 * Returns the JDT IMethod of the indexed setter,
-	 * or null if this is either not an indexed property,
-	 * or is an indexed property but has only the array-
-	 * based setter.
-	 * @return The JDT IMethod of the indexed setter,
-	 * or null if this is not an indexed property or
-	 * if there is no indexed setter.
-	 */
-	public IMethod getIndexedSetter ();
-	
-	/**
-	 * Returns the type within which the getter and/or setter
-	 * of this property is declared, or null if none.
-	 * @return The type within which the getter and/or setter
-	 * of this property is declared.
-	 */
-	public IType getDeclaringType ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
deleted file mode 100644
index 0912c9d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRule.java
+++ /dev/null
@@ -1,129 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * A Java Web service conformance Rule tests some collection
- * of Java resources that implement, or are meant to implement,
- * a Web service against a single, concise requirement as is
- * typically defined by a specification (eg. JAX-RPC, JSR 109)
- * or a runtime (eg. Apache Axis).
- * <p>
- * Every rule must have a namespace and a unique ID under that
- * that namespace. Every rule may have a short name and a long
- * description, both of which are recommended but optional.
- * <p>
- * Every rule follows a lifecycle of initialization, analysis
- * and completion. A Java Web service rule engine will drive
- * the <code>init()</code> method to initialize the rule, then
- * drive the various <code>visit...()</code> methods as it
- * navigates some collection of JDT resources, then drive the
- * <code>getResults()</code> method to indicate analysis is done
- * and retrieve a status object with the results of the analysis.
- */
-public interface IJavaWebServiceRule
-{
-	/**
-	 * Returns the unique identifier of the rule
-	 * within the namespace to which the rule belongs.
-	 * @return The unique identifier of the rule.
-	 * Valid rule identifiers must not be negative.
-	 */
-	public int getId ();
-	
-	/**
-	 * Returns the namespace to which this rule belongs.
-	 * @return The namespace to which this rule belongs.
-	 * Never returns null.
-	 */
-	public String getNamespace ();
-
-	/**
-	 * Returns the translatable short name of this rule.  
-	 * @return The translatable short name of this rule,
-	 * or null if the rule has no name.
-	 */
-	public String getName ();
-
-	/**
-	 * Returns the translatable description of this rule.
-	 * @return The translatable description of this rule,
-	 * or null if the rule has no description.
-	 */
-	public String getDescription ();
-
-	/**
-	 * Called by the rule engine to give this rule a chance
-	 * to initialize itself prior to visiting JDT objects.
-	 * @param engine The engine initializing this rule.
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine );
-
-	/**
-	 * Called by the rule engine when it decides to visit
-	 * a Java class (ie. primitive types are excluded).
-	 * @param jdtClass The class to visit.
-	 * @param peanutTrail The trail of objects back to the root.
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail );
-
-	/**
-	 * Called by the rule engine when it decides to visit
-	 * a Java class found on the throws clause of a method.
-	 * @param jdtClass The exception class to visit.
-	 * @param peanutTrail The trail of objects back to the root.
-	 */
-	public void visitException ( IType jdtClass, Stack peanutTrail );
-
-	/**
-	 * Called by the rule engine when it decides to visit
-	 * a field belonging to a class.
-	 * @param jdtField The field to visit.
-	 * @param peanutTrail The trail of objects back to the root.
-	 */
-	public void visitField ( IField jdtField, Stack peanutTrail );
-
-	/**
-	 * Called by the rule engine when it decides to visit
-	 * a Java Bean property (ie. represented by a "get" and/or
-	 * "set" method) beloning to a class.
-	 * @param beanProperty The property to visit.
-	 * @param peanutTrail The trail of objects back to the root.
-	 */
-	public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail );
-
-	/**
-	 * Called by the rule engine when it decides to visit a method.
-	 * @param jdtMethod The method to visit.
-	 * @param peanutTrail The trail of objects back to the root.
-	 */
-	public void visitMethod ( IMethod jdtMethod, Stack peanutTrail );
-
-	/**
-	 * Called by the rule engine after all JDT objects have
-	 * been visited so that the rule can return a status
-	 * object (usually a multi-status) with a summary of
-	 * any violations by JDT objects detected by this rule.
-	 * @return The results of the rule's analysis.
-	 */
-	public IStatus getResults ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
deleted file mode 100644
index 23ef0b6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/IJavaWebServiceRuleEngine.java
+++ /dev/null
@@ -1,56 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is an engine that walks a JDT model and runs rules.
- */
-public interface IJavaWebServiceRuleEngine
-{
-	/**
-	 * Analyzes the given class in the context of the given 
-	 * project for compliance to a set of JAX-RPC rules.
-	 * @param project The project context of the analysis.
-	 * @param rootClass The IType of the class to analyze.
-	 * @param rules The rules to use for the analysis.
-	 * @return An IStatus summarizing the results of the analysis.
-	 */
-	public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules );
-	
-	/**
-	 * Returns the JDTResolver in use by this analyzer.
-	 * The JDTResolver is guaranteed not to be null only
-	 * after the analyze method has been invoked and before
-	 * the first rule is visited. This method is intended
-	 * for use by implementations of IJavaWebServiceRule.
-	 * @return The JDTResolver in use by this analyzer.
-	 */
-	public JDTResolver getJDTResolver ();
-	
-	/**
-	 * Returns the progress monitor in use by this analyzer,
-	 * or null if no progress monitor is in use.
-	 * This method is intended for use by implementations
-	 * of IJavaWebServiceRule.
-	 * @return The progress monitor in use by this analyzer,
-	 * or null for none.
-	 */
-	public IProgressMonitor getProgressMonitor ();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
deleted file mode 100644
index 115efb7..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceAnalyzer.java
+++ /dev/null
@@ -1,214 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- * 20060607   145604 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.rules.JAXRPCRuleSetFactory;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This class provides convenience methods for analyzing
- * compliance of Java service classes and value types to
- * the JAX-RPC 1.1 specification. Typical usage of this
- * class:
- * <code>
- * IType type = JAXRPCWebServiceAnalyzer.asType(myJavaFileResource);
- * JavaWebServiceRuleSet rules = JAXRPCWebServiceAnalyzer.getRuleSet();
- * JAXRPCWebServiceAnalyzer.getRuleEngine().analyze(type,rules,myProgressMonitor);
- * </code> 
- * @author cbrealey
- */
-public class JAXRPCWebServiceAnalyzer
-{
-	private JavaWebServiceRuleSet ruleSet_;
-	
-	/**
-	 * Constructs a new JAX-RPC Web service analyzer,
-	 * a convenience class wrapped around a
-	 * JAXRPCWebServiceAnalyzer.
-	 */
-	public JAXRPCWebServiceAnalyzer ()
-	{
-		ruleSet_ = JAXRPCRuleSetFactory.newRuleSet();
-	}
-
-	/**
-	 * Returns the set of rules in use, the contents of
-	 * which can be manipulated and will be respected by
-	 * this analyzer. In other words, this method returns a
-	 * reference to, not a copy of, the set of rules in use.
-	 * @return The set of rules in use by the analyzer.
-	 */
-	public JavaWebServiceRuleSet getRuleSet ()
-	{
-		return ruleSet_;
-	}
-	
-	/**
-	 * Analyzes the Java service class represented by the given
-	 * JDT type for compliance to the JAX-RPC for compliance to
-	 * the JAX-RPC specification.
-	 * Progress monitoring is provided by the given monitor. 
-	 * @param project The project context in which the analysis
-	 * should take place.
-	 * @param rootClass The Java service class to analyze.
-	 * @param monitor The progress monitor to use,
-	 * or null if monitoring is not desired.
-	 * @return A status object whose severity, message and
-	 * child status objects, if any, describe any JAX-RPC
-	 * rules that may be compromised by the service class.
-	 * Never returns null.
-	 */
-	public IStatus analyze ( IProject project, IType rootClass, IProgressMonitor monitor )
-	{
-		IJavaWebServiceRuleEngine engine = new JAXRPCWebServiceRuleEngine(monitor);
-		return engine.analyze(project,rootClass,ruleSet_);
-	}
-
-	/**
-	 * Analyzes the Java service class represented by the given
-	 * JDT type for compliance to the JAX-RPC for compliance to
-	 * the JAX-RPC specification.
-	 * Progress monitoring is provided by the given monitor. 
-	 * @param project The project context in which the analysis
-	 * should take place.
-	 * @param rootClass The fully qualified name of the
-	 * Java service class to analyze.
-	 * @param monitor The progress monitor to use,
-	 * or null if monitoring is not desired.
-	 * @return A status object whose severity, message and
-	 * child status objects, if any, describe any JAX-RPC
-	 * rules that may be compromised by the service class.
-	 * Never returns null.
-	 */
-	public IStatus analyze ( IProject project, String rootClass, IProgressMonitor monitor )
-	{
-		try
-		{
-			IType rootType = asType(rootClass,project);
-			if (rootType == null)
-			{
-				String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass,project.getName());
-				return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
-			}
-			return analyze(project,rootType,monitor);
-		}
-		catch (JavaModelException e)
-		{
-			// An exception may be thrown from the call to asType(...),
-			// not from the call to analyze(...). Exceptions within the
-			// analyze(...) method are captured in the returned IStatus.
-			return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
-		}
-	}
-
-	/**
-	 * Analyzes the Java service class represented by the given
-	 * ".java" compilation unit or ".class" file for compliance
-	 * to the JAX-RPC specification.
-	 * Progress monitoring is provided by the given monitor. 
-	 * @param project The project context in which the analysis
-	 * should take place.
-	 * @param rootClass The Java service class to analyze.
-	 * @param monitor The progress monitor to use,
-	 * or null if monitoring is not desired.
-	 * @return A status object whose severity, message and
-	 * child status objects, if any, describe any JAX-RPC
-	 * rules that may be compromised by the service class.
-	 * Never returns null.
-	 */
-	public IStatus analyze ( IProject project, IFile rootClass, IProgressMonitor monitor )
-	{
-		try
-		{
-			IType rootType = asType(rootClass);
-			if (rootType == null)
-			{
-				String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_UNRESOLVED_CLASS,rootClass.getFullPath().toString(),project.getName());
-				return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,message,null);
-			}
-			return analyze(project,rootType,monitor);
-		}
-		catch (JavaModelException e)
-		{
-			// An exception may be thrown from the call to asType(...),
-			// not from the call to analyze(...). Exceptions within the
-			// analyze(...) method are captured in the returned IStatus.
-			return new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e);
-		}
-	}
-
-	/**
-	 * Returns the Java type represented by the given file,
-	 * or null if no such type can be clearly determined.
-	 * @param file The file whose type to infer, usually a
-	 * ".java" or ".class" file. For ".java" files, this
-	 * method will return the primary type.
-	 * @return The inferred JDT Java type.
-	 * @throws JavaModelException If the given file could not
-	 * mapped to a JDT IType.
-	 */
-	private static IType asType ( String qname, IProject project )
-	throws JavaModelException
-	{
-		IType type = null;
-		IJavaElement javaElement = JavaCore.create(project);
-		if (javaElement instanceof IJavaProject)
-		{
-			IJavaProject javaProject = (IJavaProject)javaElement;
-			type = javaProject.findType(qname);
-		}
-		return type;
-	}
-	/**
-	 * Returns the Java type represented by the given file,
-	 * or null if no such type can be clearly determined.
-	 * @param file The file whose type to infer, usually a
-	 * ".java" or ".class" file. For ".java" files, this
-	 * method will return the primary type.
-	 * @return The inferred JDT Java type.
-	 * @throws JavaModelException If the given file could not
-	 * mapped to a JDT IType.
-	 */
-	private static IType asType ( IFile file )
-	throws JavaModelException
-	{
-		IType type = null;
-		IJavaElement javaElement = JavaCore.create(file);
-		if (javaElement instanceof ICompilationUnit)
-		{
-			ICompilationUnit compilationUnit = (ICompilationUnit)javaElement;
-			type = compilationUnit.findPrimaryType();
-		}
-		else if (javaElement instanceof IClassFile)
-		{
-			IClassFile classFile = (IClassFile)javaElement;
-			type = classFile.getType();
-		}
-		return type;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
deleted file mode 100644
index 33597f0..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JAXRPCWebServiceRuleEngine.java
+++ /dev/null
@@ -1,278 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711   149411 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author cbrealey
- * This engine navigated JDT classes according to a JAX-RPC
- * interpretation. The root class is considered to be a
- * candidate JAX-RPC service class, and any non-standard
- * or non-primitive types used by the methods of the service
- * class are considered to be candidates for JAX-RPC value
- * type classes. 
- */
-public class JAXRPCWebServiceRuleEngine implements IJavaWebServiceRuleEngine
-{
-	/**
-	 * Creates a new JAX-RPC analysis engine with the given
-	 * progress monitor.
-	 * @param progressMonitor The progress monitor for the
-	 * engine to use, or null if monitoring is not desired.
-	 */
-	public JAXRPCWebServiceRuleEngine ( IProgressMonitor progressMonitor )
-	{
-		progressMonitor_ = progressMonitor;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#analyze(org.eclipse.core.resources.IProject, org.eclipse.jdt.core.IType, org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IStatus analyze ( IProject project, IType rootClass, JavaWebServiceRuleSet rules )
-	{
-		visited_ = new HashSet();
-		peanutTrail_ = new Stack();		
-		resolver_ = new JDTResolver(project,progressMonitor_);
-		IStatus status = null;
-		rules.init(this);
-		try
-		{
-			analyzeServiceClass(rootClass,rules);
-			String inCaseOfFailureMessage = NLS.bind(WSPluginMessages.MSG_JAXRPC11_NOT_COMPLIANT,rootClass.getFullyQualifiedName());
-			status = rules.getResults(inCaseOfFailureMessage);
-		}
-		catch (JavaModelException e)
-		{
-			status = new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal Error",e);
-		}
-		return status;
-	}
-	
-	private void analyzeServiceClass ( IType type, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		rules.visitClass(type,peanutTrail_);
-		visited_.add(type.getFullyQualifiedName());
-		push(type);
-		try
-		{
-			IType[] superClasses = resolver_.getSuperClasses(type);
-			IMethod[] methods = resolver_.getPublicMethods(type,superClasses);
-			for (int m=0; m<methods.length; m++)
-			{
-				analyzeMethod(methods[m],rules);
-			}
-		}
-		finally
-		{
-			pop();
-		}
-	}
-	
-	private void analyzeMethod ( IMethod method, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		rules.visitMethod(method,peanutTrail_);
-		push(method);
-		try
-		{
-			IType returnType = resolver_.getReturnType(method);
-			analyzeDataType(returnType,rules);
-			IType[] parameterTypes = resolver_.getParameterTypes(method);
-			for (int p=0; p<parameterTypes.length; p++)
-			{
-				analyzeDataType(parameterTypes[p],rules);
-			}
-			IType[] exceptionTypes = resolver_.getExceptionTypes(method);
-			for (int e=0; e<exceptionTypes.length; e++)
-			{
-				analyzeExceptionType(exceptionTypes[e],rules);
-			}
-		}
-		finally
-		{
-			pop();
-		}
-	}
-	
-	private void analyzeDataType ( IType type, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
-		{
-			rules.visitClass(type,peanutTrail_);			
-			visited_.add(type.getFullyQualifiedName());
-			push(type);
-			try
-			{	
-				IType[] superClasses = resolver_.getSuperClasses(type);
-				IField[] fields = resolver_.getPublicFields(type,superClasses);
-				for (int f=0; f<fields.length; f++)
-				{
-					analyzeField(fields[f],rules);
-				}
-				IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
-				for (int p=0; p<properties.length; p++)
-				{
-					analyzeProperty(properties[p],rules);
-				}
-			}
-			finally
-			{
-				pop();
-			}
-		}
-	}
-	
-	private void analyzeField ( IField field, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		if (field != null)
-		{
-			rules.visitField(field,peanutTrail_);
-			push(field);
-			try
-			{
-				//TODO: Get qualified name of the field type
-				//and determine if we need to build an IType
-				//for it and analyze it.
-				IType type = resolver_.getFieldType(field);
-				analyzeDataType(type,rules);
-			}
-			finally
-			{
-				pop();
-			}
-		}
-	}
-	
-	private void analyzeProperty ( IJavaBeanProperty property, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		if (property != null)
-		{
-			rules.visitProperty(property,peanutTrail_);
-			push(property);
-			try
-			{
-				IType type = resolver_.getPropertyType(property);
-				analyzeDataType(type,rules);
-			}
-			finally
-			{
-				pop();
-			}
-		}
-	}
-
-	private void analyzeExceptionType ( IType type, JavaWebServiceRuleSet rules )
-	throws JavaModelException
-	{
-		if (type != null && !resolver_.isStandardType(type.getFullyQualifiedName()) && !visited_.contains(type.getFullyQualifiedName()))
-		{
-			rules.visitException(type,peanutTrail_);
-			visited_.add(type.getFullyQualifiedName());
-			push(type);
-			try
-			{
-				// We trust java.lang.Exception/Throwable as superclasses
-				// for service specific exception classes, therefore we do
-				// not try to analyze their properties (some of which would
-				// otherwise violate JAX-RPC's rules anyways).
-				IType[] superClasses = resolver_.getSuperClasses(type,"java.lang.Exception");
-				IJavaBeanProperty[] properties = resolver_.getPublicProperties(type,superClasses);
-				for (int p=0; p<properties.length; p++)
-				{
-					analyzeProperty(properties[p],rules);
-				}
-			}
-			finally
-			{
-				pop();
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getJDTResolver()
-	 */
-	public JDTResolver getJDTResolver ()
-	{
-		return resolver_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine#getProgressMonitor()
-	 */
-	public IProgressMonitor getProgressMonitor ()
-	{
-		return progressMonitor_;
-	}
-	
-	/*
-	 * Pushes a peanut onto the peanut trail.
-	 */
-	private void push ( Object peanut )
-	{
-		peanutTrail_.push(peanut);
-	}
-	
-	/*
-	 * Pops a peanut off the peanut trail. 
-	 */
-	private void pop ()
-	{
-		peanutTrail_.pop();
-	}
-	
-	/*
-	 * The JDTResolver used by this analyzer.
-	 */
-	private JDTResolver resolver_;
-	
-	/*
-	 * The progress monitor used by this analyzer. 
-	 */
-	private IProgressMonitor progressMonitor_;
-	
-	/*
-	 * This set keeps track of the fully qualified names of
-	 * classes we have visited so that we don't visit the same
-	 * service class, value type or exception class more than once.
-	 */
-	private Set visited_;
-
-	/*
-	 * This stack keeps a trail of JDT objects back to the
-	 * service class we began with. This can be useful to
-	 * visitors that need to inspect the JDT elements that
-	 * enclose the currently visited element.
-	 */
-	private Stack peanutTrail_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
deleted file mode 100644
index bdc5748..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JDTResolver.java
+++ /dev/null
@@ -1,883 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey
- * 20060711   149411 cbrealey@ca.ibm.com - Chris Brealey
- * 20070102   196371 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * @author cbrealey
- * A JDTResolver provides several convenience methods for
- * navigating references between Java classes, methods,
- * fields and properties. A JDTResolver is constructed
- * for a Java project whose effective classpath will
- * govern the scope of search operations performed by the
- * JDTResolver whenever it needs to convert a signature
- * into a JDT IType object.
- */
-public class JDTResolver
-{
-	/**
-	 * Creates a new JDTResolver for the given project.
-	 * @param project The project providing the context
-	 * @param monitor The progress monitor for this resolver
-	 * to use, or null if progress monitoring is not desired.
-	 * within which this resolver will search for classes.
-	 */
-	public JDTResolver ( IProject project, IProgressMonitor monitor )
-	{
-		javaProject_ = JavaCore.create(project);
-		monitor_ = monitor;
-	}
-	
-	/**
-	 * Returns true if and only if the given JDT IType is an interface.
-	 * @param jdtType The type to analyze.
-	 * @return True if and only if the given JDT IType is an interface.
-	 * @throws JavaModelException If the JDT model fails to
-	 * analyze the given type.
-	 */
-	public boolean isInterface ( IType jdtType )
-	throws JavaModelException
-	{
-		return jdtType.isInterface();
-	}
-	
-	/**
-	 * Returns true if and only if the given JDT IType is an abstract class.
-	 * @param jdtType The type to analyze.
-	 * @return True if and only if the given JDT IType is an abstract class.
-	 * @throws JavaModelException If the JDT model fails to
-	 * analyze the given type.
-	 */
-	public boolean isAbstract ( IType jdtType )
-	throws JavaModelException
-	{
-		return Flags.isAbstract(jdtType.getFlags());
-	}
-	
-	/**
-	 * Returns true if and only if instances of the given JDT IType
-	 * can be instantiated via a public default constructor. The class
-	 * must have an explicit public default constructor, or have no
-	 * explicit constructors at all to meet this criteria.
-	 * @param jdtType The type to analyze.
-	 * @return True if and only if instances of the type are
-	 * public default constructable.
-	 * @throws JavaModelException If the JDT model fails to
-	 * analyze the given type.
-	 */
-	public boolean isConstructable ( IType jdtType )
-	throws JavaModelException
-	{
-		IMethod[] methods = jdtType.getMethods();
-		int numberOfConstructors = 0;
-		for (int m=0; m<methods.length; m++)
-		{
-			if (methods[m].isConstructor())
-			{
-				numberOfConstructors++;
-				if (methods[m].getNumberOfParameters() == 0 && Flags.isPublic(methods[m].getFlags()))
-				{
-					return true;
-				}
-			}
-		}
-		return numberOfConstructors == 0;
-	}
-	
-	/**
-	 * Returns true if and only if the given fully qualified
-	 * type name is a type from the standard JDK, that is,
-	 * if the given type name belongs under the "java" or
-	 * "javax" packages.
-	 * @param typeName The name of the type to check.
-	 * @return True if and only if the type is a non-primitive,
-	 * Java standard type.
-	 */
-	public boolean isStandardType ( String typeName )
-	{
-		return typeName.startsWith("java.") || typeName.startsWith("javax.");
-	}
-	
-	/**
-	 * Returns true if and only if the given type name is a
-	 * Java primitive type.
-	 * @param typeName The name of the type to check.
-	 * @return True if and only if the type is a Java primitive type.
-	 */
-	public boolean isPrimitiveType ( String typeName )
-	{
-		for (int i=0; i<primitiveTypes_.length; i++)
-		{
-			if (primitiveTypes_[i].equals(typeName))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Returns true if and only if the given fully qualified
-	 * type name is a Java wrapper type.
-	 * @param typeName The name of the type to check.
-	 * @return True if and only if the type is a Java wrapper type.
-	 */
-	public boolean isWrapperType ( String typeName )
-	{
-		for (int i=0; i<wrapperTypes_.length; i++)
-		{
-			if (wrapperTypes_[i].equals(typeName))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-		
-	/**
-	 * Returns true if and only if the given fully qualified
-	 * type name is a Java primitive or standard type supported
-	 * by the JAX-RPC specification.
-	 * @param typeName The name of the type to check.
-	 * @return True if and only if the type is a Java wrapper type.
-	 */
-	public boolean isJAXRPCStandardType ( String typeName )
-	{
-		for (int i=0; i<jaxrpcTypes_.length; i++)
-		{
-			if (jaxrpcTypes_[i].equals(typeName))
-			{
-				return true;
-			}
-		}
-		if (isWrapperType(typeName) && !"java.lang.Character".equals(typeName))
-		{
-			return true;
-		}
-		if (isPrimitiveType(typeName) && !"char".equals(typeName))
-		{
-			return true;
-		}
-		return false;
-	}
-		
-	/**
-	 * Returns an array of zero or more JDT IType objects
-	 * for the public fields belonging to the given type
-	 * @param jdtType The type to analyze.
-	 * @param jdtSuperTypes Any supertypes to analyze,
-	 * or null to analyze only the <code>jdtType</code>.
-	 * @return An array of zero or more public field types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given types to satisfy this request.
-	 */
-	public IField[] getPublicFields ( IType jdtType, IType[] jdtSuperClasses )
-	throws JavaModelException
-	{
-		List fieldsList = new LinkedList();
-		harvestPublicFields(jdtType,fieldsList);
-		if (jdtSuperClasses != null)
-		{
-			for (int t=0; t<jdtSuperClasses.length; t++)
-			{
-				harvestPublicFields(jdtSuperClasses[t],fieldsList);
-			}
-		}
-		return (IField[])fieldsList.toArray(new IField[0]);
-	}
-	
-	/**
-	 * Returns an array of zero or more JDT IMethod objects
-	 * for the public methods belonging to the given type.
-	 * @param jdtType The type to analyze.
-	 * @param jdtSuperTypes Any supertypes to analyze,
-	 * or null to analyze only the <code>jdtType</code>.
-	 * @return An array of zero or more public methods.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given types to satisfy this request.
-	 */
-	public IMethod[] getPublicMethods ( IType jdtType, IType[] jdtSuperClasses )
-	throws JavaModelException
-	{
-		List methodsList = new LinkedList();
-		harvestPublicMethods(jdtType,methodsList);
-		if (jdtSuperClasses != null)
-		{
-			for (int t=0; t<jdtSuperClasses.length; t++)
-			{
-				harvestPublicMethods(jdtSuperClasses[t],methodsList);
-			}
-		}
-		return (IMethod[])methodsList.toArray(new IMethod[0]);
-	}
-	
-	/**
-	 * Returns an array of zero or more JDT IType objects
-	 * for the public properties (getters and/or setters)
-	 * belonging to the given type.
-	 * @param jdtType The type to analyze.
-	 * @param jdtSuperTypes Any supertypes to analyze,
-	 * or null to analyze only the <code>jdtType</code>.
-	 * @return An array of zero or more public property types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given types to satisfy this request.
-	 */
-	public IJavaBeanProperty[] getPublicProperties ( IType jdtType, IType[] jdtSuperClasses )
-	throws JavaModelException
-	{
-		IMethod[] methods = getPublicMethods(jdtType,jdtSuperClasses);
-		Map properties = new HashMap();
-		for (int m=0; m<methods.length; m++)
-		{
-			String name = getGetterName(methods[m]);
-			if (name != null)
-			{
-				JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
-				if (property == null)
-				{
-					property = new JavaBeanProperty();
-					property.setName(name);
-					properties.put(name,property);
-				}
-				property.setGetter(methods[m]);
-			}
-			else
-			{
-				name = getSetterName(methods[m]);
-				if (name != null)
-				{
-					JavaBeanProperty property = (JavaBeanProperty)properties.get(name);
-					if (property == null)
-					{
-						property = new JavaBeanProperty();
-						property.setName(name);
-						properties.put(name,property);
-					}
-					property.setSetter(methods[m]);
-				}
-			}
-		}
-		return (IJavaBeanProperty[])properties.values().toArray(new JavaBeanProperty[0]);
-	}
-	
-	/**
-	 * Returns the JDT IType object for the given field.
-	 * @param jdtField The field to analyze.
-	 * @return The field type.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given field to satisfy this request.
-	 */
-	public IType getFieldType ( IField jdtField )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String signature = jdtField.getTypeSignature();
-		String typeName = getTypeNameFromSignature(signature);
-		return findType(typeName,ancestor);
-	}
-	
-	/**
-	 * Returns the type name for the given field.
-	 * @param jdtField The field to analyze.
-	 * @return The field type name.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given field to satisfy this request.
-	 */
-	public String getFieldTypeName ( IField jdtField )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtField.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String signature = jdtField.getTypeSignature();
-		String typeName = getTypeNameFromSignature(signature);
-		return resolveType(typeName,ancestor);
-	}
-	
-	/**
-	 * Returns the JDT IType object for the given bean property.
-	 * @param javaBeanProperty The bean property to analyze.
-	 * @return The property type.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given bean property to satisfy this request.
-	 */
-	public IType getPropertyType ( IJavaBeanProperty javaBeanProperty )
-	throws JavaModelException
-	{
-		IMethod method = javaBeanProperty.getGetter();
-		if (method != null)
-		{
-			return getReturnType(method);
-		}
-		else
-		{
-			method = javaBeanProperty.getSetter();
-			if (method != null)
-			{
-				IType[] parameters = getParameterTypes(method);
-				if (parameters.length > 0)
-				{
-					//
-					// It's the last parameter's type we want,
-					// for indexed or non-indexed setters.
-					//
-					return parameters[parameters.length-1];
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the type name for the given bean property.
-	 * @param javaBeanProperty The bean property to analyze.
-	 * @return The property type name.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given bean property to satisfy this request.
-	 */
-	public String getPropertyTypeName ( IJavaBeanProperty javaBeanProperty )
-	throws JavaModelException
-	{
-		IMethod method = javaBeanProperty.getGetter();
-		if (method != null)
-		{
-			return getReturnTypeName(method);
-		}
-		else
-		{
-			method = javaBeanProperty.getSetter();
-			if (method != null)
-			{
-				String[] parameterTypeNames = getParameterTypeNames(method);
-				if (parameterTypeNames.length > 0)
-				{
-					return parameterTypeNames[0];
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the JDT IType object for the return type
-	 * of the given method, or null if the method is void.
-	 * @param jdtMethod The method to analyze.
-	 * @return The method return type, or null if none.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public IType getReturnType ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String signature = jdtMethod.getReturnType();
-		String typeName = getTypeNameFromSignature(signature);
-		return findType(typeName,ancestor);
-	}
-	
-	/**
-	 * Returns the type name for the return type
-	 * of the given method, or null if the method is void.
-	 * @param jdtMethod The method to analyze.
-	 * @return The method return type name, or null if none.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public String getReturnTypeName ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String signature = jdtMethod.getReturnType();
-		String typeName = getTypeNameFromSignature(signature);
-		return resolveType(typeName,ancestor);
-	}
-	
-	/**
-	 * Returns an array of zero or more JDT IType objects
-	 * for the parameters of the given method.
-	 * @param jdtMethod The method to analyze.
-	 * @return An array of zero or more parameter types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public IType[] getParameterTypes ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String[] signatures = jdtMethod.getParameterTypes();
-		IType[] types = new IType[signatures.length];
-		for (int s=0; s<signatures.length; s++)
-		{
-			String typeName = getTypeNameFromSignature(signatures[s]);
-			types[s] = findType(typeName,ancestor);
-		}
-		return types;
-	}
-	
-	/**
-	 * Returns an array of zero or more type names
-	 * for the parameters of the given method.
-	 * @param jdtMethod The method to analyze.
-	 * @return An array of zero or more parameter type names.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public String[] getParameterTypeNames ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String[] signatures = jdtMethod.getParameterTypes();
-		String[] typeNames = new String[signatures.length];
-		for (int s=0; s<signatures.length; s++)
-		{
-			String typeName = getTypeNameFromSignature(signatures[s]);
-			typeNames[s] = resolveType(typeName,ancestor);
-		}
-		return typeNames;
-	}
-	
-	/**
-	 * Returns an array of zero or more JDT IType objects
-	 * for the exceptions thrown by the given method.
-	 * @param jdtMethod The method to analyze.
-	 * @return An array of zero or more exception types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public IType[] getExceptionTypes ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String[] signatures = jdtMethod.getExceptionTypes();
-		IType[] types = new IType[signatures.length];
-		for (int s=0; s<signatures.length; s++)
-		{
-			String typeName = getTypeNameFromSignature(signatures[s]);
-			types[s] = findType(typeName,ancestor);
-		}
-		return types;
-	}
-	
-	/**
-	 * Returns an array of zero or more type names
-	 * for the exceptions thrown by the given method.
-	 * @param jdtMethod The method to analyze.
-	 * @return An array of zero or more exception type names.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given method to satisfy this request.
-	 */
-	public String[] getExceptionTypeNames ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		IJavaElement elem = jdtMethod.getAncestor(IJavaElement.TYPE);
-		IType ancestor = elem instanceof IType ? (IType)elem : null;
-		String[] signatures = jdtMethod.getExceptionTypes();
-		String[] typeNames = new String[signatures.length];
-		for (int s=0; s<signatures.length; s++)
-		{
-			String typeName = getTypeNameFromSignature(signatures[s]);
-			typeNames[s] = resolveType(typeName,ancestor);
-		}
-		return typeNames;
-	}
-	
-	/**
-	 * Returns an array of zero or more types representing
-	 * the superclasses, if any, of the given IType in bottom-up
-	 * order excluding java.lang.Object.
-	 * @param jdtType The type to analyze.
-	 * @return An array of zero or more superclass types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given type to satisfy this request.
-	 */
-	public IType[] getSuperClasses ( IType jdtType )
-	throws JavaModelException
-	{
-		return getSuperClasses(jdtType,"java.lang.Object");
-	}
-	
-	/**
-	 * Returns an array of zero or more types representing
-	 * the superclasses, if any, of the given IType.
-	 * Under normal circumstances, java.lang.Object is included.
-	 * @param jdtType The type to analyze.
-	 * @param stopClassName The name of a stop class used to limit
-	 * the superclasses returned to the caller. If the stop class
-	 * is null or names a class not found in the hierarchy, all
-	 * superclasses are returned. Otherwise, only superclasses up
-	 * to but excluding the stop class are returned.
-	 * @return An array of zero or more superclass types.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given type to satisfy this request.
-	 */
-	public IType[] getSuperClasses ( IType jdtType, String stopClassName )
-	throws JavaModelException
-	{
-		ITypeHierarchy hierarchy = jdtType.newSupertypeHierarchy(monitor_);
-		IType[] allSuperClasses = hierarchy.getAllSuperclasses(jdtType);
-		List superClasses = new LinkedList();
-		for (int i=0; i<allSuperClasses.length; i++)
-		{
-			if (allSuperClasses[i].getFullyQualifiedName().equals(stopClassName))
-				break;
-			superClasses.add(allSuperClasses[i]);
-		}
-		return (IType[])superClasses.toArray(new IType[0]);
-	}
-	
-	/**
-	 * Extracts the qualified type name from a JDT signature.
-	 * @param signature The signature to examine.
-	 * @return The qualified type name from the signature.
-	 */
-	public String getTypeNameFromSignature ( String signature )
-	{
-
-		String packageName = Signature.getSignatureQualifier(signature);
-		String baseName = Signature.getSignatureSimpleName(signature);
-		if (baseName.endsWith("[]")){
-			baseName = baseName.substring(0, baseName.indexOf("["));
-		}
-			
-		String typeName = (packageName.trim().equals("")?"":packageName+".") + baseName;
-		return typeName;
-	}
-	
-	/**
-	 * Attempts to resolve an unresolved type name in the
-	 * context of the given ancestor type (ie. the type
-	 * acting as the context within which the type name
-	 * should be resolved).
-	 * @param typeName The qualified name of the type to find.
-	 * @param ancestor The type providing the context within
-	 * which to look up the type.
-	 * @return The qualified name, or the original type name
-	 * if it could not be resolved.
-	 */
-	public String resolveType ( String typeName, IType ancestor )
-	throws JavaModelException
-	{
-		if (ancestor != null)
-		{
-			String[][] matches = ancestor.resolveType(typeName);
-			if (matches != null && matches.length > 0)
-			{
-				StringBuffer qname = new StringBuffer();
-				int n = matches[0].length;
-				for (int j=0; j<n-1; j++)
-				{
-					qname.append(matches[0][j]).append(".");
-				}
-				if (n >= 0)
-				{
-					qname.append(matches[0][n-1]);
-				}
-				return qname.toString();
-			}
-		}
-		return typeName;
-	}
-
-	/**
-	 * Attempts to find a JDT IType object for the given
-	 * resolved or unresolved type name in the context of
-	 * the given ancestor type (ie. the type acting as the
-	 * context within which the type name should be resolved).
-	 * @param typeName The qualified name of the type to find.
-	 * @param ancestor The type providing the context within
-	 * which to look up the type.
-	 * @return The IType object of the given qualified name,
-	 * or null if no type could be found in the workspace.
-	 */
-	public IType findType ( String typeName, IType ancestor )
-	throws JavaModelException
-	{
-		IType type = javaProject_.findType(typeName);
-		if (type == null && ancestor != null)
-		{
-			String[][] matches = ancestor.resolveType(typeName);
-			if (matches != null)
-			{
-				int i=0;
-				while (type == null && i<matches.length)
-				{
-					StringBuffer qname = new StringBuffer();
-					int n = matches[i].length;
-					for (int j=0; j<n-1; j++)
-					{
-						qname.append(matches[i][j]).append(".");
-					}
-					if (n >= 0)
-					{
-						qname.append(matches[i][n-1]);
-					}
-					type = javaProject_.findType(qname.toString());
-					i++;
-				}
-			}
-		}
-		return type;
-	}
-
-	/**
-	 * Finds all public, non-constructor IMethods belonging
-	 * to the given IType and adds them to the given list.
-	 * @param jdtType The type whose methods are to be harvested.
-	 * @param list The list to which the harvested methods will be added.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given type to satisfy this request.
-	 */
-	public void harvestPublicMethods ( IType jdtType, List list )
-	throws JavaModelException
-	{
-		IMethod[] methods = jdtType.getMethods();
-		for (int m=0; m<methods.length; m++)
-		{
-			if (!methods[m].isConstructor() && Flags.isPublic(methods[m].getFlags()))
-			{
-				list.add(methods[m]);
-			}
-		}
-	}
-	
-	/**
-	 * Finds all public IFields belonging
-	 * to the given IType and adds them to the given list.
-	 * @param jdtType The type whose fields are to be harvested.
-	 * @param list The list to which the harvested fields will be added.
-	 * @throws JavaModelException If the JDT engine fails to
-	 * analyze the given type to satisfy this request.
-	 */
-	public void harvestPublicFields ( IType jdtType, List list )
-	throws JavaModelException
-	{
-		IField[] fields = jdtType.getFields();
-		for (int f=0; f<fields.length; f++)
-		{
-			if (Flags.isPublic(fields[f].getFlags()))
-			{
-				list.add(fields[f]);
-			}
-		}
-	}
-	
-	/**
-	 * If the given method is a getter according to the Bean spec
-	 * (eg. "MyType getMyProperty ()" or "boolean isMyProperty ()")
-	 * return the corresponding bean property name (eg. "myProperty"),
-	 * otherwise, return null.
-	 * @param method The method to check.
-	 * @return The property name or none if the method is not a getter.
-	 */
-	public String getGetterName ( IMethod method )
-	{
-		try
-		{
-			String methodName = method.getElementName();
-			if (methodName.startsWith("get") && methodName.length() > 3)
-			{
-				String signature = method.getSignature();
-				String returnTypeName = Signature.getReturnType(signature);
-				//
-				// Getters must not be void.
-				//
-				if (returnTypeName != null && returnTypeName != Signature.SIG_VOID)
-				{
-					String[] parameterSignatures = method.getParameterTypes();
-					//
-					// Non-indexed getters must have zero parameters.
-					//
-					if (parameterSignatures.length == 0)
-					{
-						return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
-					}
-					//
-					// Indexed getters must have exactly one parameter of type "int".
-					//
-					else if (parameterSignatures.length == 1)
-					{
-						String indexTypeName = getTypeNameFromSignature(parameterSignatures[0]);
-						if (indexTypeName.equals("int"))
-						{
-							return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
-						}
-					}
-				}
-			}
-			else if (methodName.startsWith("is") && methodName.length() > 2)
-			{
-				String signature = method.getSignature();
-				String returnTypeName = Signature.getReturnType(signature);
-				//
-				// "is" getters must be boolean.
-				//
-				if (Signature.SIG_BOOLEAN.equals(returnTypeName))
-				{
-					//
-					// "is" getters must have no parameters.
-					//
-					if (method.getParameterTypes().length == 0)
-					{
-						return methodName.substring(2,3).toLowerCase() + methodName.substring(3);
-					}
-				}
-			}
-		}
-		catch (JavaModelException e)
-		{
-			return null;
-		}
-		return null;
-	}
-	
-	/**
-	 * If the given method is a setter according to the Bean spec
-	 * (eg. "void setMyProperty (MyType)" return the corresponding
-	 * bean property name (eg. "myProperty"), otherwise, return null.
-	 * @param method The method to check.
-	 * @return The property name or none if the method is not a setter.
-	 */
-	public String getSetterName ( IMethod method )
-	{
-		try
-		{
-			String methodName = method.getElementName();
-			if (methodName.startsWith("set") && methodName.length() > 3)
-			{
-				String signature = method.getSignature();
-				String returnTypeName = Signature.getReturnType(signature);
-				//
-				// Setters must be void.
-				//
-				if (Signature.SIG_VOID.equals(returnTypeName))
-				{
-					String[] parameterSignatures = method.getParameterTypes();
-					//
-					// Non-indexed setters must have exactly one parameter.
-					//
-					if (parameterSignatures.length == 1)
-					{
-						return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
-					}
-					//
-					// Indexed setters must have exactly two parameters,
-					// the first of which must be "int".
-					//
-					else if (parameterSignatures.length == 2)
-					{
-						if (Signature.SIG_INT.equals(parameterSignatures[0]))
-						{
-							return methodName.substring(3,4).toLowerCase() + methodName.substring(4);
-						}
-					}
-				}
-			}
-		}
-		catch (JavaModelException e)
-		{
-			return null;
-		}
-		return null;
-	}
-	
-	/*
-	 * The Java project that governs the search scope for this resolver.
-	 */
-	private IJavaProject javaProject_;
-	
-	/*
-	 * The progress monitor to use, if any. 
-	 */
-	private IProgressMonitor monitor_;
-	
-	/*
-	 * The set of Java wrapper types.
-	 */
-	private static String[] wrapperTypes_ = {
-		"java.lang.Character",
-		"java.lang.Boolean",
-		"java.lang.Byte",
-		"java.lang.Short",
-		"java.lang.Integer",
-		"java.lang.Long",
-		"java.lang.Float",
-		"java.lang.Double"
-	};
-
-	/*
-	 * The set of Java primitive types.
-	 */
-	private static String[] primitiveTypes_ = {
-		"char",
-		"boolean",
-		"byte",
-		"short",
-		"int",
-		"long",
-		"float",
-		"double"
-	};
-
-	/*
-	 * The set of JAX-RPC supported Java standard types,
-	 * excluding primitives and wrapper types.
-	 */
-	private static String[] jaxrpcTypes_ = {
-		"boolean",
-		"byte",
-		"short",
-		"int",
-		"long",
-		"float",
-		"double",
-		"java.lang.String",
-		"java.lang.Boolean",
-		"java.lang.Byte",
-		"java.lang.Short",
-		"java.lang.Integer",
-		"java.lang.Long",
-		"java.lang.Float",
-		"java.lang.Double",
-		"java.util.Date",
-		"java.util.Calendar",
-		"java.math.BigInteger",
-		"java.math.BigDecimal",
-		"java.net.URI",
-		"javax.xml.namespace.QName"
-	};
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
deleted file mode 100644
index 529d552..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaBeanProperty.java
+++ /dev/null
@@ -1,147 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This is a garden variety implementation of IJavaBeanProperty,
- * constructable by default and equipped with getters and setters
- * for the properties of IJavaBeanProperty.
- */
-public class JavaBeanProperty implements IJavaBeanProperty
-{
-	private String name_;
-	private boolean indexed_;
-	private IMethod getter_;
-	private IMethod setter_;
-	private IMethod indexedGetter_;
-	private IMethod indexedSetter_;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getName()
-	 */
-	public String getName ()
-	{
-		return name_;
-	}
-	
-	/**
-	 * Sets the "name" property of this Java Bean Property descriptor.
-	 * @param name The string value to set.
-	 */
-	public void setName ( String name )
-	{
-		name_ = name;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#isIndexed()
-	 */
-	public boolean isIndexed ()
-	{
-		return indexed_;
-	}
-	
-	/**
-	 * Sets the "indexed" property of this Java Bean Property descriptor.
-	 * @param indexed The boolean value to set.
-	 */
-	public void setIndexed ( boolean indexed )
-	{
-		indexed_ = indexed;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getGetter()
-	 */
-	public IMethod getGetter ()
-	{
-		return getter_;
-	}
-	
-	/**
-	 * Sets the "getter" property of this Java Bean Property descriptor.
-	 * @param getter The IMethod to set.
-	 */
-	public void setGetter ( IMethod getter )
-	{
-		getter_ = getter;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getSetter()
-	 */
-	public IMethod getSetter ()
-	{
-		return setter_;
-	}
-	
-	/**
-	 * Sets the "setter" property of this Java Bean Property descriptor.
-	 * @param setter The IMethod to set.
-	 */
-	public void setSetter ( IMethod setter )
-	{
-		setter_ = setter;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedGetter()
-	 */
-	public IMethod getIndexedGetter ()
-	{
-		return indexedGetter_;
-	}
-	
-	/**
-	 * Sets the "indexedGetter" property of this Java Bean Property descriptor.
-	 * @param indexedGetter The IMethod to set.
-	 */
-	public void setIndexedGetter ( IMethod indexedGetter )
-	{
-		indexedGetter_ = indexedGetter;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getIndexedSetter()
-	 */
-	public IMethod getIndexedSetter ()
-	{
-		return indexedSetter_;
-	}
-	
-	/**
-	 * Sets the "indexedSetter" property of this Java Bean Property descriptor.
-	 * @param indexedSetter The IMethod to set.
-	 */
-	public void setIndexedSetter ( IMethod indexedSetter )
-	{
-		indexedSetter_ = indexedSetter;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty#getDeclaringType()
-	 */
-	public IType getDeclaringType ()
-	{
-		IMethod method = getGetter();
-		if (method == null) method = getSetter();
-		if (method == null) method = getIndexedGetter();
-		if (method == null) method = getIndexedSetter();
-		return method != null ? method.getDeclaringType() : null;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
deleted file mode 100644
index 39ffa31..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRule.java
+++ /dev/null
@@ -1,143 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * A basic default implementation of IJavaWebServiceRule.
- */
-public class JavaWebServiceRule implements IJavaWebServiceRule
-{
-	protected IJavaWebServiceRuleEngine engine_;
-	protected List statusList_;
-	protected int id_;
-	protected String namespace_;
-	protected String name_;
-	protected String description_;
-	
-	protected JavaWebServiceRule ()
-	{
-		// Not publicly constructable.
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getId()
-	 */
-	public int getId ()
-	{
-		return id_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getNamespace()
-	 */
-	public String getNamespace ()
-	{
-		return namespace_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getName()
-	 */
-	public String getName ()
-	{
-		return name_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getDescription()
-	 */
-	public String getDescription ()
-	{
-		return description_;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#init()
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine )
-	{
-		engine_ = engine;
-		statusList_ = new LinkedList();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitException(org.eclipse.jdt.core.IField, java.util.Stack)
-	 */
-	public void visitException ( IType jdtClass, Stack peanutTrail )
-	{
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitField(org.eclipse.jdt.core.IField, java.util.Stack)
-	 */
-	public void visitField ( IField jdtField, Stack peanutTrail )
-	{
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitProperty(org.eclipse.jdt.core.IMethod, org.eclipse.jdt.core.IMethod, java.util.Stack)
-	 */
-	public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
-	{
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
-	 */
-	public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
-	{
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRule#getResults()
-	 */
-	public IStatus getResults ()
-	{
-		IStatus status = null;
-		if (statusList_.size() == 0)
-		{
-			status = new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
-		}
-		else
-		{
-			MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,"",null);
-			Iterator i = statusList_.iterator();
-			while (i.hasNext())
-			{
-				multiStatus.add((IStatus)i.next());
-			}
-			status = multiStatus;
-		}
-		return status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
deleted file mode 100644
index f487714..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/JavaWebServiceRuleSet.java
+++ /dev/null
@@ -1,285 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-
-/**
- * @author cbrealey
- * This object manages a set of rules.
- * Rules in the set may be enabled or disabled.
- */
-public class JavaWebServiceRuleSet
-{
-	private Set enabledRules_ = new HashSet();
-	private Set disabledRules_ = new HashSet();
-	
-	/**
-	 * Creates a new, initially empty set of rules.
-	 */
-	public JavaWebServiceRuleSet ()
-	{
-		// Nothing to do.
-	}
-
-	/**
-	 * Creates a new set of rules initialized with those
-	 * from the given array of <code>rules</code>.
-	 * @param rules An array of rules to add.
-	 */
-	public JavaWebServiceRuleSet ( IJavaWebServiceRule[] rules )
-	{
-		addRules(rules);
-	}
-	
-	/**
-	 * Adds a <code>rule</code> to the set.
-	 * Rules added to the set are initially enabled.
-	 * @param rule The rule to add.
-	 */
-	public void addRule ( IJavaWebServiceRule rule )
-	{
-		enabledRules_.add(rule);
-	}
-	
-	/**
-	 * Adds several <code>rules</code> to the set.
-	 * Rules added to the set are initially enabled.
-	 * @param rules The array of rules to add.
-	 */
-	public void addRules ( IJavaWebServiceRule[] rules )
-	{
-		enabledRules_.addAll(Arrays.asList(rules));
-	}
-	
-	/**
-	 * Marks the given <code>rule</code> as disabled or enabled.
-	 * This method has no effect if the rule is not already in
-	 * the set, in other words, this method will not have the
-	 * side effect of adding a rule to the set.
-	 * @param rule The rule to disable or enable.
-	 * @param disabled True to disable the rule or false to enable it.
-	 * @return True if a change in status was actually made.
-	 */
-	public boolean setRuleDisabled ( IJavaWebServiceRule rule, boolean disabled )
-	{
-		if (disabled)
-		{
-			if (enabledRules_.remove(rule))
-			{
-				disabledRules_.add(rule);
-				return true;
-			}
-		}
-		else
-		{
-			if (disabledRules_.remove(rule))
-			{
-				enabledRules_.add(rule);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Returns the number of rules in the set.
-	 * @return The number of rules in the set.
-	 */
-	public int size ()
-	{
-		return enabledRules_.size() + disabledRules_.size();
-	}
-	
-	/**
-	 * Returns the number of enabled rules in the set.
-	 * @return The number of enabled rules in the set.
-	 */
-	public int numberEnabled ()
-	{
-		return enabledRules_.size();
-	}
-	
-	/**
-	 * Returns the number of disabled rules in the set.
-	 * @return The number of disabled rules in the set.
-	 */
-	public int numberDisabled ()
-	{
-		return disabledRules_.size();
-	}
-	
-	/**
-	 * Returns an array of all currently enabled rules from the set.
-	 * @return An array of all currently enabled rules from the set.
-	 */
-	public IJavaWebServiceRule[] getEnabledRules ()
-	{
-		return (IJavaWebServiceRule[])enabledRules_.toArray(new IJavaWebServiceRule[0]);
-	}
-	
-	/**
-	 * Returns an array of all currently disabled rules from the set.
-	 * @return An array of all currently disabled rules from the set.
-	 */
-	public IJavaWebServiceRule[] getDisabledRules ()
-	{
-		return (IJavaWebServiceRule[])disabledRules_.toArray(new IJavaWebServiceRule[0]);
-	}
-	
-	/**
-	 * Initializes all rules in the set by calling
-	 * their init() methods with the given engine.
-	 * @param engine The engine initializing 
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.init(engine);
-		}
-	}
-
-	/**
-	 * Visits the "visitClass" method of all rules in the set. 
-	 * @param jdtClass The JDT IType being visited.
-	 * @param peanutTrail The stack of objects up to the root.
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.visitClass(jdtClass,peanutTrail);
-		}		
-	}
-
-	/**
-	 * Visits the "visitException" method of all rules in the set. 
-	 * @param jdtClass The JDT IType being visited.
-	 * @param peanutTrail The stack of objects up to the root.
-	 */
-	public void visitException ( IType jdtClass, Stack peanutTrail )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.visitException(jdtClass,peanutTrail);
-		}
-	}
-
-
-	/**
-	 * Visits the "visitField" method of all rules in the set. 
-	 * @param jdtClass The JDT IField being visited.
-	 * @param peanutTrail The stack of objects up to the root.
-	 */
-	public void visitField ( IField jdtField, Stack peanutTrail )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.visitField(jdtField,peanutTrail);
-		}
-	}
-
-	/**
-	 * Visits the "visitProperty" method of all rules in the set. 
-	 * @param jdtClass The IJavaBeanProperty being visited.
-	 * @param peanutTrail The stack of objects up to the root.
-	 */
-	public void visitProperty ( IJavaBeanProperty beanProperty, Stack peanutTrail )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.visitProperty(beanProperty,peanutTrail);
-		}
-	}
-
-	/**
-	 * Visits the "visitMethod" method of all rules in the set. 
-	 * @param jdtClass The JDT IMethod being visited.
-	 * @param peanutTrail The stack of objects up to the root.
-	 */
-	public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
-	{
-		Iterator i = enabledRules_.iterator();
-		while (i.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)i.next();
-			rule.visitMethod(jdtMethod,peanutTrail);
-		}
-	}
-	
-	/**
-	 * Collects the results of all rules in the set together.
-	 * If one or more warnings or errors are found, returns
-	 * a status object whose top level message is the root
-	 * message passed to this message, otherwise, returns a
-	 * basic "OK" status.
-	 * @param rootMessage The warning/error message to act as
-	 * the root message if necessary (ie. if at least one rule
-	 * in the set reported at least one warning/error).
-	 * @return The collective status.
-	 */
-	public IStatus getResults ( String rootMessage )
-	{
-		List list = new LinkedList();
-		Iterator e = enabledRules_.iterator();
-		while (e.hasNext())
-		{
-			IJavaWebServiceRule rule = (IJavaWebServiceRule)e.next();
-			IStatus status = rule.getResults();
-			if (!status.isOK())
-			{
-				list.add(status);
-			}
-		}
-		if (list.size() > 0)
-		{
-			MultiStatus multiStatus = new MultiStatus("org.eclipse.jst.ws",0,rootMessage,null);
-			Iterator l = list.iterator();
-			while (l.hasNext())
-			{
-				IStatus status = (IStatus)l.next();
-				multiStatus.addAll(status);
-			}
-			return multiStatus;
-		}
-		else
-		{
-			return new Status(IStatus.OK,"org.eclipse.jst.ws",0,"",null);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
deleted file mode 100644
index 1441079..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0001.java
+++ /dev/null
@@ -1,68 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a service class
- * is public default constructable.
- */
-public class JAXRPCRule0001 extends JavaWebServiceRule
-{
-	/**
-	 * Creates a new instance of this rule.
-	 */
-	public JAXRPCRule0001 ()
-	{
-		id_ = 1;
-		namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
-		name_ = null;
-		description_ = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		// An empty peanut trail implies this is the root
-		// class or JAX-RPC service class.
-		if (peanutTrail.size() == 0)
-		{
-			try
-			{
-				JDTResolver resolver = engine_.getJDTResolver();
-				if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
-				{
-					String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0001,jdtClass.getFullyQualifiedName());
-					statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-				}
-			}
-			catch (JavaModelException e)
-			{
-				statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
deleted file mode 100644
index 7049c33..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0002.java
+++ /dev/null
@@ -1,82 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule checks if a value type class
- * is public default constructable.
- */
-public class JAXRPCRule0002 extends JavaWebServiceRule
-{
-	/**
-	 * Creates a new instance of this rule.
-	 */
-	public JAXRPCRule0002 ()
-	{
-		id_ = 2;
-		namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
-		name_ = null;
-		description_ = null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		// An empty peanut trail implies this is the root class
-		// root class or JAX-RPC service class, whereas a non-empty
-		// peanut trail implies this is a class from a method, field
-		// or property signature. In the former case, remember the
-		// qualified name of the type just in case we need it for the
-		// latter case.
-		if (peanutTrail.size() == 0)
-		{
-			serviceClassName_ = jdtClass.getFullyQualifiedName();
-		}
-		else
-		{
-			try
-			{
-				JDTResolver resolver = engine_.getJDTResolver();
-				String qname = jdtClass.getFullyQualifiedName();
-				if (!resolver.isStandardType(qname))
-				{ 
-					if (!resolver.isConstructable(jdtClass) || resolver.isInterface(jdtClass) || resolver.isAbstract(jdtClass))
-					{
-						String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0002,qname,serviceClassName_);
-						statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-					}
-				}
-			}
-			catch (JavaModelException e)
-			{
-				statusList_.add(new Status(IStatus.ERROR,"org.eclipse.jst.ws",0,"Internal error",e));
-			}
-		}
-	}
-	
-	private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
deleted file mode 100644
index bc65bcd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0003.java
+++ /dev/null
@@ -1,151 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that a service class has no overloaded methods.
- */
-public class JAXRPCRule0003 extends JavaWebServiceRule
-{
-	/**
-	 * Creates a new instance of this rule.
-	 */
-	public JAXRPCRule0003 ()
-	{
-		id_ = 3;
-		namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
-		name_ = null;
-		description_ = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine )
-	{
-		super.init(engine);
-		methodNames_ = new HashMap();
-		overloadedMethodNames_ = new HashSet();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		//
-		// An empty peanut trail implies this is the root
-		// class, aka. JAX-RPC service class. Put aside
-		// the class name in case visitMethod() needs it.
-		//
-		if (peanutTrail.size() == 0)
-		{
-			serviceClassName_ = jdtClass.getFullyQualifiedName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
-	 */
-	public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
-	{
-		//
-		// A peanut trail of length one implies this is a method
-		// belonging to the root class, aka. JAX-RPC service class.
-		//
-		if (peanutTrail.size() == 1)
-		{
-			try
-			{
-				//
-				// If we have encountered this method already but haven't
-				// reported the overload condition, report it.
-				//
-				String methodName = jdtMethod.getElementName();
-				String firstParameterSignature = (String)methodNames_.get(methodName);
-				String thisParameterSignature = flattenedSignatureOf(jdtMethod);
-				if (thisParameterSignature != null)
-				{
-					if (firstParameterSignature != null)
-					{
-						//
-						// If we have encountered this method's name already,
-						// but have not yet determined if it is overloaded,
-						// then compare this method's parameter signature with
-						// that of the "first signature" of the method name.
-						// The moment we find a second signature for a given
-						// method name, we have an overload condition.
-						//
-						if (!overloadedMethodNames_.contains(methodName) && !thisParameterSignature.equals(firstParameterSignature))
-						{
-							overloadedMethodNames_.add(methodName);
-							String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0003,methodName,serviceClassName_);
-							statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-						}
-					}
-					else
-					{
-						//
-						// If we have recorded no signature for the given method
-						// name (ie. we have not encountered the method name yet),
-						// then record this one. Any "first signature" will do.
-						//
-						methodNames_.put(methodName,thisParameterSignature);
-					}
-				}
-			}
-			catch (JavaModelException e)
-			{
-				// Do nothing.
-			}
-		}
-	}
-	
-	/*
-	 * Grabs the types of the parameters of the given method
-	 * and flattens then into a single string sufficient to
-	 * distinguish between overloaded vs. overridden methods.
-	 */
-	private String flattenedSignatureOf ( IMethod jdtMethod )
-	throws JavaModelException
-	{
-		String[] signatures = engine_.getJDTResolver().getParameterTypeNames(jdtMethod);
-		StringBuffer flattenedSignature = new StringBuffer();
-		for (int s=0; s<signatures.length; s++)
-		{
-			flattenedSignature.append(signatures[s]).append(",");
-		}
-		return flattenedSignature.toString();
-	}
-	
-	private Map methodNames_;
-	private Set overloadedMethodNames_;
-	private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
deleted file mode 100644
index c66cf7a..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0005.java
+++ /dev/null
@@ -1,121 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the methods of a service class
- * uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0005 extends JavaWebServiceRule
-{
-	/**
-	 * Creates a new instance of this rule.
-	 */
-	public JAXRPCRule0005 ()
-	{
-		id_ = 5;
-		namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
-		name_ = null;
-		description_ = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine )
-	{
-		super.init(engine);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		//
-		// An empty peanut trail implies this is the root
-		// class, aka. JAX-RPC service class. Put aside
-		// the class name in case visitMethod() needs it.
-		//
-		if (peanutTrail.size() == 0)
-		{
-			serviceClassName_ = jdtClass.getFullyQualifiedName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
-	 */
-	public void visitMethod ( IMethod jdtMethod, Stack peanutTrail )
-	{
-		//
-		// A peanut trail of length one implies this is a method
-		// belonging to the root class, aka. JAX-RPC service class.
-		//
-		if (peanutTrail.size() == 1)
-		{
-			try
-			{
-				String methodName = jdtMethod.getElementName();
-				//
-				// Check the method return type for compliance.
-				// Any Java primitive or standard ("java." or "javax.") type
-				// that is not supported by JAX-RPC will get flagged.
-				// Any non-primitive or non-standard type is presumed to be a
-				// potential value type and is bypassed since the rule engine
-				// will navigate into the potential value type's class.
-				//
-				JDTResolver resolver = engine_.getJDTResolver();
-				String returnTypeName = resolver.getReturnTypeName(jdtMethod);
-				if ((resolver.isPrimitiveType(returnTypeName) || resolver.isStandardType(returnTypeName)) && !resolver.isJAXRPCStandardType(returnTypeName))
-				{
-					String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,returnTypeName});
-					statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-				}
-				//
-				// Check the method parameter types for compliance.
-				// Same comment as above, only applied to the method's parameters.
-				//
-				String[] parameterTypeNames = resolver.getParameterTypeNames(jdtMethod);
-				for (int p=0; p<parameterTypeNames.length; p++)
-				{
-					if ((resolver.isPrimitiveType(parameterTypeNames[p]) || resolver.isStandardType(parameterTypeNames[p])) && !resolver.isJAXRPCStandardType(parameterTypeNames[p]))
-					{
-						String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0005,new String[] {methodName,serviceClassName_,parameterTypeNames[p]});
-						statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-					}
-				}
-			}
-			catch (JavaModelException e)
-			{
-				// Do nothing.
-			}
-		}
-	}
-	
-	private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
deleted file mode 100644
index 407afd3..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRule0006.java
+++ /dev/null
@@ -1,164 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import java.util.Stack;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.WSPluginMessages;
-import org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty;
-import org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine;
-import org.eclipse.jst.ws.internal.conformance.JDTResolver;
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * This rule verifies that the fields and properties of a
- * value type class uses only JAX-RPC supported types.
- */
-public class JAXRPCRule0006 extends JavaWebServiceRule
-{
-	/**
-	 * Creates a new instance of this rule.
-	 */
-	public JAXRPCRule0006 ()
-	{
-		id_ = 6;
-		namespace_ = "http://www.eclipse.org/webtools/org.eclipse.jst.ws/jaxrpc/1.1";
-		name_ = null;
-		description_ = null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#init(org.eclipse.jst.ws.internal.conformance.IJavaWebServiceRuleEngine)
-	 */
-	public void init ( IJavaWebServiceRuleEngine engine )
-	{
-		super.init(engine);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitClass(org.eclipse.jdt.core.IType, java.util.Stack)
-	 */
-	public void visitClass ( IType jdtClass, Stack peanutTrail )
-	{
-		//
-		// An empty peanut trail implies this is the root
-		// class, aka. JAX-RPC service class. Put aside
-		// the class name in case visitMethod() needs it.
-		//
-		if (peanutTrail.size() == 0)
-		{
-			serviceClassName_ = jdtClass.getFullyQualifiedName();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitMethod(org.eclipse.jdt.core.IMethod, java.util.Stack)
-	 */
-	public void visitField ( IField jdtField, Stack peanutTrail )
-	{
-		//
-		// A peanut trail of length greater than one implies this is a
-		// field belonging to a class other than the root (aka. JAX-RPC
-		// service) class, namely a presumed value type class.
-		//
-		if (peanutTrail.size() > 1)
-		{
-			try
-			{
-				//
-				// Any Java primitive or standard ("java." or "javax.") type
-				// that is not supported by JAX-RPC will get flagged.
-				// Any non-primitive or non-standard type is presumed to be a
-				// potential value type and is bypassed since the rule engine
-				// will navigate into the potential value type's class.
-				//
-				JDTResolver resolver = engine_.getJDTResolver();
-				String fieldTypeName = resolver.getFieldTypeName(jdtField);
-				if ((resolver.isPrimitiveType(fieldTypeName) || resolver.isStandardType(fieldTypeName)) && !resolver.isJAXRPCStandardType(fieldTypeName))
-				{
-					//
-					// The field pretty much MUST be declared in a type or
-					// we would not have gotten here. Still, best to be safe.
-					//
-					IType valueType = jdtField.getDeclaringType();
-					if (valueType != null)
-					{
-						String valueTypeClassName = valueType.getFullyQualifiedName();
-						String fieldName = jdtField.getElementName();
-						String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {fieldName,valueTypeClassName,serviceClassName_,fieldTypeName});
-						statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-					}
-				}
-			}
-			catch (JavaModelException e)
-			{
-				// Do nothing.
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.conformance.JavaWebServiceRule#visitProperty(org.eclipse.jst.ws.internal.conformance.IJavaBeanProperty, java.util.Stack)
-	 */
-	public void visitProperty ( IJavaBeanProperty property, Stack peanutTrail )
-	{
-		//
-		// A peanut trail of length greater than one implies this is a
-		// property belonging to a class other than the root (aka. JAX-RPC
-		// service) class, namely a presumed value type class.
-		//
-		if (peanutTrail.size() > 1)
-		{
-			try
-			{
-				//
-				// Any Java primitive or standard ("java." or "javax.") type
-				// that is not supported by JAX-RPC will get flagged.
-				// Any non-primitive or non-standard type is presumed to be a
-				// potential value type and is bypassed since the rule engine
-				// will navigate into the potential value type's class.
-				//
-				JDTResolver resolver = engine_.getJDTResolver();
-				String propertyTypeName = resolver.getPropertyTypeName(property);
-				if ((resolver.isPrimitiveType(propertyTypeName) || resolver.isStandardType(propertyTypeName)) && !resolver.isJAXRPCStandardType(propertyTypeName))
-				{
-					//
-					// The field pretty much MUST be declared in a type or
-					// we would not have gotten here. Still, best to be safe.
-					//
-					IType valueType = property.getDeclaringType();
-					if (valueType != null)
-					{
-						String valueTypeClassName = valueType.getFullyQualifiedName();
-						String propertyName = property.getName();
-						String message = NLS.bind(WSPluginMessages.MSG_JAXRPC11_RULE_0006,new String[] {propertyName,valueTypeClassName,serviceClassName_,propertyTypeName});
-						statusList_.add(new Status(IStatus.WARNING,"org.eclipse.jst.ws",0,message,null));
-					}
-				}
-			}
-			catch (JavaModelException e)
-			{
-				// Do nothing.
-			}
-		}
-	}
-	
-	private String serviceClassName_;
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
deleted file mode 100644
index 0f1c7a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/conformance/rules/JAXRPCRuleSetFactory.java
+++ /dev/null
@@ -1,44 +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
- * -------- -------- -----------------------------------------------------------
- * 20060419   132905 cbrealey@ca.ibm.com - Chris Brealey          
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.conformance.rules;
-
-import org.eclipse.jst.ws.internal.conformance.JavaWebServiceRuleSet;
-
-/**
- * A factory that produces a JavaWebServiceRuleSet
- * for the JAX-RPC 1.1 specification.
- */
-public class JAXRPCRuleSetFactory
-{
-	private JAXRPCRuleSetFactory ()
-	{
-		// Not publicly constructable.
-	}
-	
-	/**
-	 * Returns a set of rules for analyzing Java classes
-	 * for compliance to the rules of JAX-RPC 1.1.  
-	 * @return A set of JAX-RPC 1.1 analysis rules.
-	 */
-	public static JavaWebServiceRuleSet newRuleSet ()
-	{
-		JavaWebServiceRuleSet set = new JavaWebServiceRuleSet();
-		set.addRule(new JAXRPCRule0001());
-		set.addRule(new JAXRPCRule0002());
-		set.addRule(new JAXRPCRule0003());
-		set.addRule(new JAXRPCRule0005());
-		set.addRule(new JAXRPCRule0006());
-		return set;
-	}
-}
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 412c053..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060216   127138 pmoogk@ca.ibm.com - Peter Moogk
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- * 20080416   227359 makandre@ca.ibm.com - Andrew Mak, Test facilities do not respect default order in plugin customization
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import java.util.Enumeration;
-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;
-import com.ibm.icu.util.StringTokenizer;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
-  public PersistentScenarioContext()
-  {
-    super(WebServicePlugin.getInstance()); 
-  }
-
-  public void load()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    String[] ids = defaults.getWebServiceTestIds();
-    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() );
-    
-    setDefaultIntIfNoDefault(PREFERENCE_GENERATE_WEBSERVICE, defaults.serviceGenerationDefault()); //jvh
-    setDefaultIntIfNoDefault(PREFERENCE_GENERATE_CLIENT, defaults.clientGenerationDefault());
-  }
-
-  public String[] getNonJavaTestService()
-  {
-    WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
-    String[] ids = getWebServiceTestIds();
-    Vector newTestCases = new Vector();
-	for (int i = 0; i < ids.length; i++)
-    {
-      WebServiceTestExtension wse = (WebServiceTestExtension) registry
-          .getWebServiceExtensionsById(ids[i]);
-      if (wse != null && wse.testWSDL()) 
-		  newTestCases.addElement(wse.getLabel());
-    }
-	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 setWebServiceTestIds(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());  
-  }
-  
-  private String[] getWebServiceTestIds(String value)
-  {
-	StringTokenizer st = new StringTokenizer(value, ",");
-	String[] s = new String[st.countTokens()];
-	for (int i = 0; i < s.length; i++) {
-	  // 154543: we have to continue to interpret the old label style preferences
-	  s[i] = WebServiceTestRegistry.getInstance().labelToId(st.nextToken());
-	}
-	return s;
-  }
-
-  public String[] getWebServiceTestIds()
-  {
-	return getWebServiceTestIds(getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES)); 
-  }  
-  
-  public String[] getDefaultWebServiceTestIds()
-  {
-	return getWebServiceTestIds(getDefaultString(PREFERENCE_WEBSERVICE_TEST_TYPES)); 
-  }	
-  
-  public void setWebServiceTestTypes(String[] ids)
-  {
-	// 154543: deprecated, noop
-  }
-
-  public String[] getWebServiceTestTypes()
-  {
-	WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
-	String[] ids = getWebServiceTestIds();  
-    Vector labels = new Vector();
-	for (int i = 0; i < ids.length; i++)
-    {
-      WebServiceTestExtension wse = (WebServiceTestExtension) registry
-          .getWebServiceExtensionsById(ids[i]);
-      if (wse != null) 
-		  labels.addElement(wse.getLabel());
-    }	  	  
-    String[] s = new String[labels.size()];
-    labels.copyInto(s);
-    return s;
-  }
-
-  public ScenarioContext copy()
-  {
-    TransientScenarioContext context = new TransientScenarioContext();
-    context.setWebServiceTestIds(getWebServiceTestIds());
-    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);
-  }
-  
-  //jvh
-  public int getGenerateWebService()
-  {
-	  return getValueAsInt(PREFERENCE_GENERATE_WEBSERVICE);
-  }
-  
-  public int getGenerateWebServiceDefault()
-  {
-	  return getDefaultInt(PREFERENCE_GENERATE_WEBSERVICE);
-  }
-  
-  public void setGenerateWebService(int value)
-  {
-	  setValue(PREFERENCE_GENERATE_WEBSERVICE, value);
-  }
-  
-  public int getGenerateClientDefault()
-  {
-	  return getDefaultInt(PREFERENCE_GENERATE_CLIENT);
-  }
-  
-  public int getGenerateClient()
-  {
-	  return getValueAsInt(PREFERENCE_GENERATE_CLIENT);
-  }
-  
-  public void setGenerateClient(int value)
-  {
-	  setValue(PREFERENCE_GENERATE_CLIENT, 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 542b1ed..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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);
-  }
-}
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 517d661..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-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 final String PREFERENCE_GENERATE_WEBSERVICE = "generateWebService"; //jvh
-  public final String PREFERENCE_GENERATE_CLIENT = "generateClient"; //jvh  
-  
-  public final static int WS_TEST=0;
-  public final static int WS_START=1;
-  public final static int WS_INSTALL=2;
-  public final static int WS_DEPLOY=3;  
-  public final static int WS_ASSEMBLE=4;
-  public final static int WS_DEVELOP=5;  
-  public final static int WS_NONE=6;
-  
-  public String[] getWebServiceTestIds();
-  public void setWebServiceTestIds(String[] ids);
-  
-  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 int getGenerateWebServiceDefault();
-  public int getGenerateWebService();
-  public void setGenerateWebService(int value);
-  
-  public int getGenerateClientDefault();
-  public int getGenerateClient();
-  public void setGenerateClient(int value);
-  
-  public ScenarioContext copy();
-}
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 af4e151..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-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[] getWebServiceTestIds()
-  {
-  	//we will set the home grown sample as the first choice
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	
-  	LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
-  	String[] ids = labelsandids.getIds_();
-  	
-  	String[] newIds = new String[ids.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){
-  	  newIds[0] = ids[index];
-  	  int j = 1;
-  	  for(int i = 0;i<ids.length;i++){
-  	    if(i != index){
-  	  	  newIds[j] = ids[i]; 
-  	      j++;
-  	    }
-  	  }
-  	}
-  	else return ids;
-  	
-  	return newIds;
-  }
-  
-  public String getNonJavaTestServiceDefault()
-  {
-    return "Web Services Explorer";	
-  } 
-  
-  public String webserviceTypeIdDefault()
-  {
-    return "0/org.eclipse.jst.ws.wsImpl.java";
-  }
-  
-  public int serviceGenerationDefault()
-  {
-	  return ScenarioContext.WS_START;  
-  }
-  
-  public int clientGenerationDefault()
-  {
-	  return ScenarioContext.WS_NONE;  
-  }
-  
-  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 dece989..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
-  private String[] webServiceTestIds;
-  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 int generateWebService_; //jvh
-  private int generateClient_; //jvh
-  
-  private ScenarioDefaults defaults = new ScenarioDefaults();
- 
-  public TransientScenarioContext () {}
-
-  public String[] getNonJavaTestService()
-  {
-    return nonJavaTestService;
-  }
- 
-  public void setNonJavaTestService(String[] nonJavaTestService)
-  {
-    this.nonJavaTestService = nonJavaTestService;	
-  }
- 
-  public void setWebServiceTestIds(String[] webServiceTestIds) {
-    this.webServiceTestIds = webServiceTestIds;
-  }
-  
-  public String[] getWebServiceTestIds() {
-    return webServiceTestIds;
-  }
-  
-  public void setWebServiceTestTypes(String[] webServiceTestTypes)
-  {
-    this.webServiceTestTypes = webServiceTestTypes;
-  }
-  
-  public String[] getWebServiceTestTypes()
-  {
-    return webServiceTestTypes;	
-  }
- 
-  public ScenarioContext copy() {
-  	TransientScenarioContext context = new TransientScenarioContext();
-  	context.setWebServiceTestIds(getWebServiceTestIds());
-	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() );
-	context.setGenerateWebService(getGenerateWebService());  //jvh
-	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;
-  }
-  
-  public void setGenerateWebService(int value)
-  {
-	  generateWebService_ = value;  
-  }
-  
-  public int getGenerateWebServiceDefault()
-  {
-	  return defaults.serviceGenerationDefault();  
-  }  
-  
-  public int getGenerateWebService()
-  {
-	  return generateWebService_; 
-  }
-  
-  public int getGenerateClientDefault()
-  {
-	  return defaults.clientGenerationDefault();
-  }
-  
-  public int getGenerateClient()
-  {
-	  return generateClient_;
-  }
-  
-  public void setGenerateClient(int value)
-  {
-	  generateClient_ = value;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface UDDIPreferenceContext 
-{
-  /*
-   * This constant String is used to lookup the column delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-  
-  /*
-   * This constant String is used to lookup the string delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-  
-  public void setUddiCatDataColumnDelimiter(String delimiter);
-  public String getUddiCatDataColumnDelimiter();
-  public void setUddiCatDataStringDelimiter(String delimiter);
-  public String getUddiCatDataStringDelimiter();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public class UDDIPreferenceDefaults
-{
-  public static final String getUddiCatDataColumnDelimiter()
-  {
-    return "#";
-  }
-  
-  public static final String getUddiCatDataStringDelimiter()
-  {
-    return "\"";
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.data;
-
-public class LabelsAndIds
-{
-  private String[] labels_;
-  private String[] ids_;
-  
-  /**
-   * @return Returns the ids_.
-   */
-  public String[] getIds_()
-  {
-    return ids_;
-  }
-  /**
-   * @param ids_ The ids_ to set.
-   */
-  public void setIds_(String[] ids_)
-  {
-    this.ids_ = ids_;
-  }
-  /**
-   * @return Returns the labels_.
-   */
-  public String[] getLabels_()
-  {
-    return labels_;
-  }
-  /**
-   * @param labels_ The labels_ to set.
-   */
-  public void setLabels_(String[] labels_)
-  {
-    this.labels_ = labels_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 25b4441..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,114 +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
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20060413   135581 rsinha@ca.ibm.com - Rupam Kuehner
- *******************************************************************************/
-/**
- */
-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_ + ")";
-  }
-  
-  public boolean equals(Object object)
-  {
-	if (object != null && object instanceof TypeRuntimeServer)
-	{
-		TypeRuntimeServer trs = (TypeRuntimeServer)object;
-		String trsTypeId = trs.getTypeId();
-		String trsRuntimeId = trs.getRuntimeId();
-		String trsServerId = trs.getServerId();
-		String trsServerInstanceId = trs.getServerInstanceId();
-		
-		boolean typeIdsMatch = ((typeId_ == null) && (trsTypeId == null)) || ((typeId_ != null) && (typeId_.equals(trsTypeId)));
-		if (!typeIdsMatch) return false;
-		boolean runtimeIdsMatch = ((runtimeId_ == null) && (trsRuntimeId == null)) || ((runtimeId_ != null) && (runtimeId_.equals(trsRuntimeId)));
-		if (!runtimeIdsMatch) return false;
-		boolean serverIdsMatch = ((serverId_ == null) && (trsServerId == null)) || ((serverId_ != null) && (serverId_.equals(trsServerId)));
-		if (!serverIdsMatch) return false;
-		boolean serverInstanceIdsMatch = ((serverInstanceId_ == null) && (trsServerInstanceId == null)) || ((serverInstanceId_ != null) && (serverInstanceId_.equals(trsServerInstanceId)));
-		if (!serverInstanceIdsMatch) return false;
-		
-		return true;		
-	}
-	
-	return false;
-  }
-}
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 e5b134e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.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 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 69c6910..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.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.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 286a9a1..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 60720d4..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ /dev/null
@@ -1,100 +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.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 afc1d07..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point 
-* also returns the extension objects 
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-  
-  /**
-  * Returns the names of all registered extensions
-  * @return The names of all registered extensions.
-  */
-  public String[] getWebServiceExtensionNames ();
-  
-  /**
-  * Returns the extension object of the given name
-  *@return WebServiceExtension object
-  */
-  public WebServiceExtension getWebServiceExtensionsByName( String name);
-
-  /**
-  * Returns All extention objects in this registry
-  *@return WebServiceExtension objects
-  */
-  public WebServiceExtension[] getWebServiceExtensions();
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 46bea11..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ /dev/null
@@ -1,118 +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
- * -------- -------- -----------------------------------------------------------
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- *******************************************************************************/
-
-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.";
-  
-  protected Hashtable nameExtensionTable_;
-  protected Vector id_;
-  protected 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  
-  */
-  protected 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 9fb367e..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 8317253..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 257ef4e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060816   104870 kathy@ca.ibm.com - Kathy Chan
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- * 20080325   184761 gilberta@ca.ibm.com - Gilbert Andrews
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.";
-
-  private List supportedRuntimes_ = new ArrayList();
-  
-  public WebServiceTestExtension(IConfigurationElement configElement)
-  {
-    super(configElement);
-       
-    String runtimesList = getConfigElement().getAttribute("supportedClientRuntimes");  
-   
-    addRuntimes(runtimesList);
-  }
-  
-  /**
-   * Adds a list of space delimited runtime IDs.
-   * 
-   * @param runtimesList The list of runtime IDs.
-   */
-  public void addRuntimes(String runtimesList) {
-	  
-	  if (runtimesList == null)
-		  return;
-	  
-	  String[] runtimes = runtimesList.split("\\s+");
-	    
-	  for (int i = 0; i < runtimes.length; i++) {	    	
-		  if (runtimes[i].length() > 0)
-			  supportedRuntimes_.add(runtimes[i]);   
-	  }
-  }
-  
-  /**
-  * Will this testClient generate code
-  * @return boolean true if codegen needed
-  */
-  public boolean isCodeGenNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "codeGenerated" )).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" );
-  }
-
-  public boolean isDefaultJAXRPC()
-  {
-	  return Boolean.valueOf(getConfigElement().getAttribute( "isdefaultjaxrpc" )).booleanValue();
-  }
-   
-  /**
-  * 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( "serverRequired" )).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;  
-  }
-  
-  public boolean testJavaProxy()
-  {
-  	String javaProxy = getConfigElement().getAttribute( "testJavaProxy" );
-    if(javaProxy == null) return false;
-  	if(javaProxy.equals("yes") || javaProxy.equals("true"))
-	  return true;
-	 
-	return false;  
-  }
-  	
-  /**
-   * Returns the id attribute of this WebServiceTestExtension
-   * 
-   * @return The value of the id attribute.
-   */
-  public String getId() {
-	return getConfigElement().getAttribute( "id" ); 
-  }
-   
-  /**
-   * Returns the label attribute of this WebServiceTestExtension
-   * 
-   * @return The value of the label attribute.
-   */
-  public String getLabel() {
-    return getConfigElement().getAttribute( "label" );
-  }
-  
-  /**
-   * Does this extension allow extenders to restrict the runtimes that are supported?
-   *  
-   * @return The value of the allowRunimesRestriction attribute, false if not present.
-   */
-  public boolean allowClientRuntimesRestriction() {
-	  return Boolean.valueOf(getConfigElement().getAttribute( "allowClientRuntimesRestriction" )).booleanValue();
-  }  
-       
-  /**
-   * Determines if this WebServiceTestExtension supports the give client runtime ID.
-   * 
-   * @return true if the client runtime ID is supported, false otherwise.
-   */
-  public boolean supportsRuntime(String runtimeId) {
-	  
-	 if (!allowClientRuntimesRestriction() || supportedRuntimes_.isEmpty())
-		 return true;
-	  
-	 return supportedRuntimes_.contains(runtimeId);
-  }
-}
-
-
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 c11e9d0..0000000
--- 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, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and 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 8cfeccc..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.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
- * -------- -------- -----------------------------------------------------------
- * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
- * 20070314   154543 makandre@ca.ibm.com - Andrew Mak, WebServiceTestRegistry is tracking extensions using label attribute instead of ID
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-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();
-  }
-  
-  /**
-   * Helper method to "join" an existing value and a new value together by
-   * a space in between.  Handles special case when either value is null. 
-   *  
-   * @param existingValue The existing value
-   * @param newValue The new value
-   * @return If eiter the existing or new value is null, simply returns the
-   * new value as is (which could be null).  Otherwise returns the value joined
-   * by a space.
-   */
-  private String genNewValue(String existingValue, String newValue) {
-	  
-	  if (existingValue == null || newValue == null)
-		  return newValue;
-	  	  	 
-	  return existingValue + " " + newValue;
-  }
-    
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#loadExtensions()
-   */
-  protected void loadExtensions ()
-  {
-	// keep track of the support runtimes for each test facility ID
-    Hashtable supportedClientRuntimes = new Hashtable();
-	  
-    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" );      
-      
-      // label is found, hence we have a master extension element
-      if (label != null) {
-    	  WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-    	  nameExtensionTable_.put(id,webServiceExtension);
-    	  label_.add(label);
-    	  id_.add(id);
-      }
-      
-      // slave extension element, which only has the id and supportedClientRuntimes attributes
-      else {
-    	  String existingValue = (String) supportedClientRuntimes.get(id);
-    	  String newValue = genNewValue(existingValue, elem.getAttribute("supportedClientRuntimes"));
-    	  
-    	  if (newValue != null)
-    		  supportedClientRuntimes.put(id, newValue);
-      }
-    }
-    
-    // merge any supportedClientRuntimes attributes from the slave elements back to the master elements
-    
-    Iterator iter = nameExtensionTable_.values().iterator();
-    
-    while (iter.hasNext()) {
-    	WebServiceTestExtension webServiceTestExtension = (WebServiceTestExtension) iter.next();
-    
-    	// skip if the extension does not allow restriction on the supported client runtimes
-    	if (webServiceTestExtension.allowClientRuntimesRestriction()) {
-    		String id = webServiceTestExtension.getId();
-    		webServiceTestExtension.addRuntimes((String) supportedClientRuntimes.get(id));
-    	}
-    }    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionNames()
-   */
-  public String[] getWebServiceExtensionNames() {
-	return (String[])label_.toArray( new String[0] );
-  } 
-
-  /**
-   * Return the ID corresponding to the label.
-   * @param label The label.
-   * @return The ID corresponding to the label, or if the label parameter is not a label
-   * (must be already an ID), it is returned.
-   */
-  public String labelToId(String label) {
-    int labelIndex = label_.indexOf(label);
-    if (labelIndex == -1)
-      return label;
-    return (String) id_.elementAt(labelIndex);
-  } 
-
-  /**
-   * Returns the WebServiceExtension with the given ID.
-   * @param id The ID.
-   * @return The WebServiceExtension object.
-   */
-  public WebServiceExtension getWebServiceExtensionsById(String id) {
-    return (WebServiceExtension) nameExtensionTable_.get(id);
-  } 
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl#getWebServiceExtensionsByName(java.lang.String)
-   */
-  public WebServiceExtension getWebServiceExtensionsByName(String name) {
-    return getWebServiceExtensionsById(labelToId(name));
-  }
-
-  /**
-  * 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 b520d13..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,97 +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
- * -------- -------- -----------------------------------------------------------
- * 20060424   115690 sengpl@ca.ibm.com - Seng Phung-Lu
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.plugin;
-
-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;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
deleted file mode 100644
index 919002b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaClientInfo.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060620   147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-/**
- * This subclass of WebServiceClientInfo adds properties
- * relevant to descriptors of Java Web service clients.
- */
-public class WebServiceJavaClientInfo extends WebServiceClientInfo
-{
-	private IType jdtType_;
-	
-	/**
-	 * Returns the JDT IType of the primary Java proxy class
-	 * of a Web service client, or null if no such class has
-	 * been located.
-	 * @return The JDT IType of the Java client proxy class.
-	 */
-	public IType getType ()
-	{
-		return jdtType_;
-	}
-	
-	/**
-	 * Sets the JDT IType of the primary Java proxy class
-	 * of a Web service client.
-	 * @param jdtType The JDT IType of the Java client proxy class.
-	 */
-	public void setType ( IType jdtType )
-	{
-		jdtType_ = jdtType;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
deleted file mode 100644
index 66d9ec9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/wsrt/WebServiceJavaInfo.java
+++ /dev/null
@@ -1,48 +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
- * -------- -------- -----------------------------------------------------------
- * 20060620   147864 cbrealey@ca.ibm.com - Chris Brealey
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.wsrt;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * This subclass of WebServiceInfo adds properties
- * relevant to descriptors of Java Web services.
- */
-public class WebServiceJavaInfo extends WebServiceInfo
-{
-	private IType jdtType_;
-	
-	/**
-	 * Returns the JDT IType of the primary Java implementation
-	 * class of a Web service, or null if no such class has
-	 * been located.
-	 * @return The JDT IType of the Java implementation class.
-	 */
-	public IType getType ()
-	{
-		return jdtType_;
-	}
-	
-	/**
-	 * Sets the JDT IType of the primary Java implementation
-	 * class of a Web service.
-	 * @param jdtType The JDT IType of the Java implementation class.
-	 */
-	public void setType ( IType jdtType )
-	{
-		jdtType_ = jdtType;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl/.classpath b/bundles/org.eclipse.wst.wsdl/.classpath
deleted file mode 100644
index a6b05d5..0000000
--- a/bundles/org.eclipse.wst.wsdl/.classpath
+++ /dev/null
@@ -1,15 +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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/w3c/dom/**"/>
-			<accessrule kind="accessible" pattern="javax/xml/namespace/QName"/>
-		</accessrules>
-	</classpathentry>
-	<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 5cf2980..0000000
--- a/bundles/org.eclipse.wst.wsdl/.cvsignore
+++ /dev/null
@@ -1,9 +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
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.wsdl/.project b/bundles/org.eclipse.wst.wsdl/.project
deleted file mode 100644
index ebc53b6..0000000
--- a/bundles/org.eclipse.wst.wsdl/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.wsdl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 28ee640..0000000
--- a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,310 +0,0 @@
-#Mon Mar 05 08:57:19 EST 2007
-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
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=52
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=52
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=52
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=52
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=36
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=52
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=52
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=52
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=36
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=68
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=84
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=84
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=2
-org.eclipse.jdt.core.formatter.blank_lines_after_package=2
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=0
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line_shifted
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=false
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=false
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
-org.eclipse.jdt.core.formatter.comment.format_line_comments=false
-org.eclipse.jdt.core.formatter.comment.format_source_code=false
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=false
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=140
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=2
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
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 1546d79..0000000
--- a/bundles/org.eclipse.wst.wsdl/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Mar 05 08:57:20 EST 2007
-eclipse.preferences.version=1
-formatter_profile=_EMFCodeFormatter.profile
-formatter_settings_version=11
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 f19b093..0000000
--- a/bundles/org.eclipse.wst.wsdl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.wsdl; singleton:=true
-Bundle-Version: 1.1.203.qualifier
-Bundle-Activator: org.eclipse.wst.wsdl.WSDLPluginImplementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.wsdl,
- org.eclipse.wst.wsdl.binding.http,
- org.eclipse.wst.wsdl.binding.http.internal.generator;x-internal:=true,
- org.eclipse.wst.wsdl.binding.http.internal.impl;x-internal:=true,
- org.eclipse.wst.wsdl.binding.http.internal.util;x-internal:=true,
- org.eclipse.wst.wsdl.binding.mime,
- org.eclipse.wst.wsdl.binding.mime.internal.impl;x-internal:=true,
- org.eclipse.wst.wsdl.binding.mime.internal.util;x-internal:=true,
- org.eclipse.wst.wsdl.binding.soap,
- org.eclipse.wst.wsdl.binding.soap.internal.generator;x-internal:=true,
- org.eclipse.wst.wsdl.binding.soap.internal.impl;x-internal:=true,
- org.eclipse.wst.wsdl.binding.soap.internal.util;x-internal:=true,
- org.eclipse.wst.wsdl.internal.extensibility;x-internal:=true,
- org.eclipse.wst.wsdl.internal.generator;x-internal:=true,
- org.eclipse.wst.wsdl.internal.generator.extension;x-internal:=true,
- org.eclipse.wst.wsdl.internal.impl;x-internal:=true,
- org.eclipse.wst.wsdl.internal.impl.wsdl4j;x-internal:=true,
- org.eclipse.wst.wsdl.internal.util;x-internal:=true,
- org.eclipse.wst.wsdl.util
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,2.5.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- javax.wsdl;bundle-version="[1.4.0,1.5.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.apache.xerces;bundle-version="[2.8.0,3.0.0)",
- com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.wsdl/about.html b/bundles/org.eclipse.wst.wsdl/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.wsdl/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" 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 ("Redistributor") 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 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.wsdl/build.properties b/bundles/org.eclipse.wst.wsdl/build.properties
deleted file mode 100644
index 26ddea0..0000000
--- a/bundles/org.eclipse.wst.wsdl/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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,\
-               META-INF/,\
-               about.html,\
-               model/
-jars.compile.order = .
-source.. = src-http/,\
-                  src-mime/,\
-                  src-soap/,\
-                  src-wsdl/
-output.. = bin/
-src.includes = component.xml,\
-               schema/
diff --git a/bundles/org.eclipse.wst.wsdl/component.xml b/bundles/org.eclipse.wst.wsdl/component.xml
deleted file mode 100644
index c4619c7..0000000
--- a/bundles/org.eclipse.wst.wsdl/component.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.wst.wsdl">
-	<component-depends unrestricted="true"></component-depends>
-	<plugin id="org.eclipse.wst.wsdl" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.ui" fragment="false" />
-	<plugin id="org.eclipse.wst.wsdl.validation" fragment="false" />
-	<plugin id="org.wsdl4j" fragment="false" />
-	<package name="org.eclipse.wst.wsdl" api="false">
-		<type name="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 106edbf..0000000
--- a/bundles/org.eclipse.wst.wsdl/grabjars.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project default="copyJars" basedir=".">
-
-	<property name="pluginName" value="org.eclipse.wst.wsdl"/>
-	<property name="version" value=""/>
-
-	<target name="copyJars" if="downloadPath">
-		<antcall target="copyJars2"/>
-	</target>
-	
-	<target name="copyJars2" if="pluginsPath">
-		<antcall target="copyJars3"/>
-	</target>
-
-	<target name="copyJars3" if="pluginName">
-		<copy todir="${pluginsPath}/${pluginName}${version}/lib" overwrite="true">
-			<fileset dir="${downloadPath}/${pluginName}${version}">
-				<filename name="*.jar"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="cleanupJars" if="pluginsPath">
-		<antcall target="cleanupJars2"/>
-	</target>
-
-	<target name="cleanupJars2" if="pluginName">
-		<delete>
-			<fileset dir="${pluginsPath}/${pluginName}${version}/lib">
-				<filename name="*.jar"/>
-			</fileset>
-		</delete>
-	</target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore b/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
deleted file mode 100644
index d392f0e..0000000
--- a/bundles/org.eclipse.wst.wsdl/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore b/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore
deleted file mode 100644
index 45c4ab3..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore
+++ /dev/null
@@ -1,27 +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="http"
-    nsURI="http://www.eclipse.org/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/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel
deleted file mode 100644
index 2c26f9f..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel
+++ /dev/null
@@ -1,31 +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-http"
-    editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="HTTP" editPluginClass="" editorPluginClass=""
-    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>HTTP.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="HTTP" basePackage="org.eclipse.wst.wsdl.binding" classPackageSuffix="internal.impl"
-      utilityPackageSuffix="internal.util" 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/model/HTTP.mdl b/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl
deleted file mode 100644
index 50630fd..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl
+++ /dev/null
@@ -1,5471 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    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"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"http")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/wsdl/2003/HTTP")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse.wst.wsdl.binding")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"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"
-				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"
-				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"
-				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"
-				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"
-				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"
-				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"
-				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"
-				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"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.wst.wsdl\\model\\org.eclipse.wst.WSDL.cat"
-		quid       	"3ADFB8E5021E")
-	    (object Class_Category "xsd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.xsd\\model\\org.eclipse.XSD.cat"
-		quid       	"39ABDC6F01AA"))
-	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" @28
-			location   	(336, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@28
-			    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" @29
-			location   	(784, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@29
-			    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" @30
-			location   	(1232, 224)
-			label      	(object ItemLabel
-			    Parent_View 	@30
-			    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)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"3ABFD9A70154"))
diff --git a/bundles/org.eclipse.wst.wsdl/model/MIME.ecore b/bundles/org.eclipse.wst.wsdl/model/MIME.ecore
deleted file mode 100644
index d1217bd..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.ecore
+++ /dev/null
@@ -1,46 +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="mime"
-    nsURI="http://www.eclipse.org/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"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eExtensibilityElements"
-        upperBound="-1" eType="ecore:EClass WSDL.ecore#//ExtensibilityElement" containment="true"/>
-  </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/model/MIME.genmodel b/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel
deleted file mode 100644
index d6bce0e..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel
+++ /dev/null
@@ -1,49 +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-mime"
-    editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="MIME" editPluginClass="" editorPluginClass=""
-    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>MIME.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="MIME" basePackage="org.eclipse.wst.wsdl.binding" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" 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" propertySortChoices="true" 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">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MIME.ecore#//MIMEPart/eExtensibilityElements"/>
-      <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" propertySortChoices="true" 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 image="false" ecoreClass="MIME.ecore#//IMIMEPart"/>
-    <genClasses image="false" ecoreClass="MIME.ecore#//IMIMEMultipartRelated"/>
-    <genClasses image="false" ecoreClass="MIME.ecore#//IMIMEContent"/>
-    <genClasses image="false" ecoreClass="MIME.ecore#//IMIMEMimeXml"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/MIME.mdl b/bundles/org.eclipse.wst.wsdl/model/MIME.mdl
deleted file mode 100644
index 08e8529..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.mdl
+++ /dev/null
@@ -1,5818 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    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"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"mime")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/wsdl/2003/MIME")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse.wst.wsdl.binding")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"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)))
-		    (object Association "$UNNAMED$6"
-			quid       	"4687379A008C"
-			roles      	(list role_list
-			    (object Role "eExtensibilityElements"
-				quid       	"4687379B0280"
-				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$7"
-				quid       	"4687379B0290"
-				supplier   	"Logical View::mime::MIMEPart"
-				quidu      	"3AC913EE00EB"
-				client_cardinality 	(value cardinality "1..1")
-				is_aggregate 	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"
-				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"
-				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"
-				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  	0)
-				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"
-				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"
-				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"
-				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"
-				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"
-				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::mime::MIMEMimeXml" @31
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1328, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    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 	@31
-				    location   	(1174, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	215)
-				width      	326
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEMultipartRelated" @32
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(752, 1136)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    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 	@32
-				    location   	(533, 1090)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	343)
-				width      	456
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::mime::MIMEContent" @33
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1792, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    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 	@33
-				    location   	(1650, 706)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	3
-				    max_width  	215)
-				width      	302
-				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  	534)
-				width      	546
-				height     	236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @35
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(976, 192)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@35
-				    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 	@35
-				    location   	(747, 195)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	2
-				    max_width  	465)
-				width      	476
-				height     	234
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritTreeView "" @36
-				location   	(976, 526)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@35
-				vertices   	(list Points
-				    (976, 526)
-				    (976, 309)))
-			    (object InheritView "" @37
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11DD038B"
-				client     	@31
-				supplier   	@35
-				line_style 	3
-				origin_attachment 	(1356, 634)
-				terminal_attachment 	(1356, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @38
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11D50330"
-				client     	@32
-				supplier   	@35
-				line_style 	3
-				origin_attachment 	(844, 1018)
-				terminal_attachment 	(844, 526)
-				drawSupplier 	@36)
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AEF11CA038E"
-				client     	@33
-				supplier   	@35
-				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   	@35
-				line_style 	3
-				origin_attachment 	(256, 650)
-				terminal_attachment 	(256, 526)
-				drawSupplier 	@36)
-			    (object AssociationViewNew "$UNNAMED$6" @41
-				location   	(303, 251)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4687379A008C"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eExtensibilityElements" @42
-					Parent_View 	@41
-					location   	(-1, -517)
-					label      	(object SegLabel @43
-					    Parent_View 	@42
-					    location   	(462, 131)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	444
-					    justify    	0
-					    label      	"+eExtensibilityElements"
-					    pctDist    	0.443320
-					    height     	60
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4687379B0280"
-					client     	@41
-					supplier   	@35
-					vertices   	(list Points
-					    (303, 251)
-					    (303, 191)
-					    (737, 191))
-					line_style 	0
-					label      	(object SegLabel @44
-					    Parent_View 	@42
-					    location   	(622, 228)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"0..*"
-					    pctDist    	0.767206
-					    height     	37
-					    orientation 	1)
-					label      	(object SegLabel @45
-					    Parent_View 	@42
-					    location   	(575, 284)
-					    anchor     	3
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	159
-					    justify    	0
-					    label      	"{ordered}"
-					    pctDist    	0.672065
-					    height     	93
-					    orientation 	1))
-				    (object RoleView "$UNNAMED$7" @46
-					Parent_View 	@41
-					location   	(-1, -517)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"4687379B0290"
-					client     	@41
-					supplier   	@34
-					line_style 	0
-					label      	(object SegLabel @47
-					    Parent_View 	@46
-					    location   	(357, 609)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1..1"
-					    pctDist    	0.900000
-					    height     	54
-					    orientation 	0))))))))
-	    (object Class_Category "wsdl"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.wst.wsdl\\model\\org.eclipse.wst.WSDL.cat"
-		quid       	"3ADFB8E5021E")
-	    (object Class_Category "xsd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.xsd\\model\\org.eclipse.XSD.cat"
-		quid       	"39ABDC6F01AA"))
-	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" @48
-			location   	(400, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@48
-			    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" @49
-			location   	(880, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@49
-			    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" @50
-			location   	(1376, 240)
-			label      	(object ItemLabel
-			    Parent_View 	@50
-			    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)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"3AC910510327"))
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore b/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore
deleted file mode 100644
index 3621aab..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore
+++ /dev/null
@@ -1,85 +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="soap"
-    nsURI="http://www.eclipse.org/wsdl/2003/SOAP" nsPrefix="soap">
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPBinding" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//ISOAPBinding">
-    <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 #//ISOAPBody">
-    <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="eEncodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eParts" upperBound="-1"
-        eType="ecore:EClass WSDL.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeaderBase" eSuperTypes="WSDL.ecore#//ExtensibilityElement">
-    <eOperations name="getEncodingStyles" eType="ecore:EClass WSDL.ecore#//IList"/>
-    <eOperations name="setEncodingStyles">
-      <eParameters name="encodingStyles" eType="ecore:EClass WSDL.ecore#//IList"/>
-    </eOperations>
-    <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="eEncodingStyles" upperBound="-1"
-        eType="#//IString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType WSDL.ecore#//QName"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eMessage" lowerBound="1"
-        eType="ecore:EClass WSDL.ecore#//Message"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ePart" lowerBound="1" eType="ecore:EClass WSDL.ecore#//Part"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPFault" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//ISOAPFault">
-    <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="eEncodingStyles" upperBound="-1"
-        eType="#//IString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="suppressedGetVisibility" value="true"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPOperation" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//ISOAPOperation">
-    <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 #//ISOAPAddress">
-    <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 #//ISOAPHeaderFault"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SOAPHeader" eSuperTypes="#//SOAPHeaderBase #//ISOAPHeader">
-    <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"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPBinding" instanceClassName="javax.wsdl.extensions.soap.SOAPBinding"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPAddress" instanceClassName="javax.wsdl.extensions.soap.SOAPAddress"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPBody" instanceClassName="javax.wsdl.extensions.soap.SOAPBody"
-      abstract="true" interface="true">
-    <eOperations name="getEncodingStyles" eType="ecore:EClass WSDL.ecore#//IList"/>
-    <eOperations name="setEncodingStyles">
-      <eParameters name="encodingStyles" eType="ecore:EClass WSDL.ecore#//IList"/>
-    </eOperations>
-    <eOperations name="getParts" eType="ecore:EClass WSDL.ecore#//IList"/>
-    <eOperations name="setParts">
-      <eParameters name="parts" eType="ecore:EClass WSDL.ecore#//IList"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPFault" instanceClassName="javax.wsdl.extensions.soap.SOAPFault"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPOperation" instanceClassName="javax.wsdl.extensions.soap.SOAPOperation"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPHeaderFault" instanceClassName="javax.wsdl.extensions.soap.SOAPHeaderFault"
-      abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISOAPHeader" instanceClassName="javax.wsdl.extensions.soap.SOAPHeader"
-      abstract="true" interface="true">
-    <eOperations name="getSOAPHeaderFaults" eType="ecore:EClass WSDL.ecore#//IList"/>
-    <eOperations name="addSOAPHeaderFault">
-      <eParameters name="soapHeaderFault" eType="#//ISOAPHeaderFault"/>
-    </eOperations>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel b/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel
deleted file mode 100644
index a8623ea..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel
+++ /dev/null
@@ -1,77 +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-soap"
-    editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="SOAP" editPluginClass="" editorPluginClass=""
-    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>SOAP.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../../..</foreignModel>
-  <genPackages prefix="SOAP" basePackage="org.eclipse.wst.wsdl.binding" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" ecorePackage="SOAP.ecore#/">
-    <genDataTypes ecoreDataType="SOAP.ecore#//IString"/>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPBinding">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPBinding/transportURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPBinding/style"/>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPBody">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPBody/use"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPBody/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPBody/eEncodingStyles"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SOAP.ecore#//SOAPBody/eParts"/>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPHeaderBase">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPHeaderBase/use"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPHeaderBase/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPHeaderBase/eEncodingStyles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPHeaderBase/message"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPHeaderBase/part"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SOAP.ecore#//SOAPHeaderBase/eMessage"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference SOAP.ecore#//SOAPHeaderBase/ePart"/>
-      <genOperations ecoreOperation="SOAP.ecore#//SOAPHeaderBase/getEncodingStyles"/>
-      <genOperations ecoreOperation="SOAP.ecore#//SOAPHeaderBase/setEncodingStyles">
-        <genParameters ecoreParameter="SOAP.ecore#//SOAPHeaderBase/setEncodingStyles/encodingStyles"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPFault">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPFault/use"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPFault/namespaceURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPFault/eEncodingStyles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPFault/name"/>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPOperation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPOperation/soapActionURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPOperation/style"/>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPAddress">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SOAP.ecore#//SOAPAddress/locationURI"/>
-    </genClasses>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPHeaderFault"/>
-    <genClasses ecoreClass="SOAP.ecore#//SOAPHeader">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference SOAP.ecore#//SOAPHeader/headerFaults"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPBinding"/>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPAddress"/>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPBody">
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPBody/getEncodingStyles"/>
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPBody/setEncodingStyles">
-        <genParameters ecoreParameter="SOAP.ecore#//ISOAPBody/setEncodingStyles/encodingStyles"/>
-      </genOperations>
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPBody/getParts"/>
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPBody/setParts">
-        <genParameters ecoreParameter="SOAP.ecore#//ISOAPBody/setParts/parts"/>
-      </genOperations>
-    </genClasses>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPFault"/>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPOperation"/>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPHeaderFault"/>
-    <genClasses image="false" ecoreClass="SOAP.ecore#//ISOAPHeader">
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPHeader/getSOAPHeaderFaults"/>
-      <genOperations ecoreOperation="SOAP.ecore#//ISOAPHeader/addSOAPHeaderFault">
-        <genParameters ecoreParameter="SOAP.ecore#//ISOAPHeader/addSOAPHeaderFault/soapHeaderFault"/>
-      </genOperations>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl b/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl
deleted file mode 100644
index 9c20f33..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl
+++ /dev/null
@@ -1,6233 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    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"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.wst.wsdl\\model\\org.eclipse.wst.WSDL.cat"
-		quid       	"3ADFB8E5021E")
-	    (object Class_Category "soap"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"soap")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/wsdl/2003/SOAP")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse.wst.wsdl.binding")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"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")
-			    (object Inheritance_Relationship
-				quid       	"45E4895502BF"
-				supplier   	"Logical View::soap::ISOAPBinding"
-				quidu      	"45E485A2001F"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "transportURI"
-				attributes 	(list Attribute_Set)
-				quid       	"3A01D3DF01E4"
-				type       	"String")
-			    (object ClassAttribute "style"
-				attributes 	(list Attribute_Set)
-				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")
-			    (object Inheritance_Relationship
-				quid       	"45E48A5B00BB"
-				supplier   	"Logical View::soap::ISOAPBody"
-				quidu      	"45E4884B0119"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A01E2D501A5"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3A93477C01B2"
-				type       	"String")
-			    (object ClassAttribute "eEncodingStyles"
-				attributes 	(list Attribute_Set)
-				quid       	"45EC98A60271"
-				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"))
-			operations 	(list Operations
-			    (object Operation "getEncodingStyles"
-				quid       	"45ED04C200EA"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEncodingStyles"
-				quid       	"45ED05730222"
-				parameters 	(list Parameters
-				    (object Parameter "encodingStyles"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3AD62E9C0056"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD62EA2025D"
-				type       	"String")
-			    (object ClassAttribute "eEncodingStyles"
-				quid       	"3EE4A58F01AE"
-				stereotype 	"0..*"
-				type       	"IString")
-			    (object ClassAttribute "message"
-				quid       	"45F06E360186"
-				type       	"QName")
-			    (object ClassAttribute "part"
-				quid       	"45F06E6C0196"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPFault"
-			quid       	"3A06D9FA00F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4A0020"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"45E48A08032C"
-				supplier   	"Logical View::soap::ISOAPFault"
-				quidu      	"45E488870119"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "use"
-				quid       	"3A09821A012B"
-				type       	"String")
-			    (object ClassAttribute "namespaceURI"
-				quid       	"3AD6204803AE"
-				type       	"String")
-			    (object ClassAttribute "eEncodingStyles"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"visibility"
-					value      	("VisibilityKind" 1)))
-				quid       	"3EE4A56303AF"
-				stereotype 	"0..*"
-				type       	"IString")
-			    (object ClassAttribute "name"
-				quid       	"45F079D10399"
-				type       	"String"))
-			language   	"Java")
-		    (object Class "SOAPOperation"
-			quid       	"3A0AD45500E8"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AE09A4E031F"
-				supplier   	"Logical View::wsdl::ExtensibilityElement"
-				quidu      	"3AD5DBB602A9")
-			    (object Inheritance_Relationship
-				quid       	"45E4897F007D"
-				supplier   	"Logical View::soap::ISOAPOperation"
-				quidu      	"45E488A50128"))
-			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")
-			    (object Inheritance_Relationship
-				quid       	"45E48A7E0109"
-				supplier   	"Logical View::soap::ISOAPAddress"
-				quidu      	"45E487E700EA"))
-			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")
-			    (object Inheritance_Relationship
-				quid       	"45ED078C02FD"
-				supplier   	"Logical View::soap::ISOAPHeaderFault"
-				quidu      	"45E488BD03A9"))
-			language   	"Java")
-		    (object Class "SOAPHeader"
-			quid       	"3AD63309016D"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"3AD63330017D"
-				supplier   	"Logical View::soap::SOAPHeaderBase"
-				quidu      	"3A01DEE7034D")
-			    (object Inheritance_Relationship
-				quid       	"45E489BC031C"
-				supplier   	"Logical View::soap::ISOAPHeader"
-				quidu      	"45E488E7008C"))
-			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 Class "ISOAPBinding"
-			quid       	"45E485A2001F"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPBinding"
-				quid       	"45E4863701D4"
-				stereotype 	"javaclass"))
-			language   	"Java")
-		    (object Class "ISOAPAddress"
-			quid       	"45E487E700EA"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPAddress"
-				quid       	"45E487F6033C"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (object Class "ISOAPBody"
-			quid       	"45E4884B0119"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getEncodingStyles"
-				quid       	"45E48E8D0222"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setEncodingStyles"
-				quid       	"45F6D6820203"
-				parameters 	(list Parameters
-				    (object Parameter "encodingStyles"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-				(object Operation "getParts"
-				quid       	"45EC58A3031C"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setParts"
-				quid       	"45F6D65A0203"
-				parameters 	(list Parameters
-				    (object Parameter "parts"
-					type       	"IList"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPBody"
-				quid       	"45E488560213"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (object Class "ISOAPFault"
-			quid       	"45E488870119"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPFault"
-				quid       	"45E4889703A9"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (object Class "ISOAPOperation"
-			quid       	"45E488A50128"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPOperation"
-				quid       	"45E488AF00AB"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (object Class "ISOAPHeaderFault"
-			quid       	"45E488BD03A9"
-			stereotype 	"Interface"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPHeaderFault"
-				quid       	"45E488CE029F"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (object Class "ISOAPHeader"
-			quid       	"45E488E7008C"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getSOAPHeaderFaults"
-				quid       	"45ED0302008C"
-				result     	"IList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "addSOAPHeaderFault"
-				quid       	"45ED039702BF"
-				parameters 	(list Parameters
-				    (object Parameter "soapHeaderFault"
-					type       	"ISOAPHeaderFault"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "javax.wsdl.extensions.soap.SOAPHeader"
-				quid       	"45E488F100BB"
-				stereotype 	"javaclass"
-				type       	"type"
-				initv      	"initval"))
-			language   	"Java")
-		    (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 "eParts"
-				quid       	"3A06E0B600C5"
-				label      	"eParts"
-				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 "eMessage"
-				quid       	"3AD62DE7004B"
-				label      	"eMessage"
-				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 "ePart"
-				quid       	"3AD62DFA0002"
-				label      	"ePart"
-				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   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::soap::SOAPBinding" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(704, 480)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(487, 372)
-				    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   	(1472, 480)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(1235, 372)
-				    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   	(752, 1552)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(612, 1504)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	280
-				    justify    	0
-				    label      	"SOAPHeader")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD63309016D"
-				width      	298
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::soap::SOAPHeaderFault" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1984, 1520)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(1797, 1472)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	374
-				    justify    	0
-				    label      	"SOAPHeaderFault")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD632B803DD"
-				width      	392
-				height     	120
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$6" @5
-				location   	(1344, 1559)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD6333701CD"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$7" @6
-					Parent_View 	@5
-					location   	(688, 55)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD633370372"
-					client     	@5
-					supplier   	@3
-					line_style 	3
-					origin_attachment 	(1344, 1559)
-					terminal_attachment 	(901, 1559))
-				    (object RoleView "headerFaults" @7
-					Parent_View 	@5
-					location   	(688, 55)
-					label      	(object SegLabel @8
-					    Parent_View 	@7
-					    location   	(1331, 1519)
-					    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 	(1344, 1559)
-					terminal_attachment 	(1788, 1559)
-					label      	(object SegLabel @9
-					    Parent_View 	@7
-					    location   	(1671, 1522)
-					    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   	(1617, 1597)
-					    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   	(2736, 784)
-				label      	(object ItemLabel
-				    Parent_View 	@11
-				    location   	(2613, 707)
-				    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   	(1472, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@12
-				    location   	(1151, 665)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	642
-				    justify    	0
-				    label      	"SOAPHeaderBase")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3A01DEE7034D"
-				width      	660
-				height     	550
-				annotation 	8
-				autoResize 	TRUE)
-			    (object AssociationViewNew "$UNNAMED$2" @13
-				location   	(2203, 858)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DE60130"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eMessage" @14
-					Parent_View 	@13
-					location   	(1051, -310)
-					label      	(object SegLabel @15
-					    Parent_View 	@14
-					    location   	(2367, 888)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	216
-					    justify    	0
-					    label      	"+eMessage"
-					    pctDist    	0.412322
-					    height     	30
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DE7004B"
-					client     	@13
-					supplier   	@11
-					line_style 	3
-					origin_attachment 	(2203, 858)
-					terminal_attachment 	(2604, 858)
-					label      	(object SegLabel @16
-					    Parent_View 	@14
-					    location   	(2479, 821)
-					    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   	(1051, -310)
-					label      	(object SegLabel @18
-					    Parent_View 	@17
-					    location   	(2055, 898)
-					    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 	(2203, 858)
-					terminal_attachment 	(1802, 858))))
-			    (object ClassView "Class" "Logical View::soap::SOAPBody" @19
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 2240)
-				label      	(object ItemLabel
-				    Parent_View 	@19
-				    location   	(1226, 2132)
-				    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 	@19
-				    location   	(1226, 2192)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	0)
-				width      	510
-				height     	240
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::wsdl::Part" @20
-				ShowCompartmentStereotypes 	TRUE
-				location   	(2352, 2080)
-				label      	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(2236, 1866)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	233
-				    justify    	0
-				    label      	"Part")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3AD5CE1C032E"
-				width      	251
-				height     	452
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$4" @21
-				location   	(2290, 1230)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD62DF802D1"
-				roleview_list 	(list RoleViews
-				    (object RoleView "ePart" @22
-					Parent_View 	@21
-					location   	(1138, 62)
-					label      	(object SegLabel @23
-					    Parent_View 	@22
-					    location   	(2380, 1779)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	120
-					    justify    	0
-					    label      	"+ePart"
-					    pctDist    	0.881465
-					    height     	90
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3AD62DFA0002"
-					client     	@21
-					supplier   	@20
-					line_style 	3
-					origin_attachment 	(2290, 1230)
-					terminal_attachment 	(2290, 1854)
-					label      	(object SegLabel @24
-					    Parent_View 	@22
-					    location   	(2237, 1779)
-					    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   	(1138, 62)
-					label      	(object SegLabel @26
-					    Parent_View 	@25
-					    location   	(1928, 1137)
-					    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
-					    (2290, 1230)
-					    (2290, 1095)
-					    (1802, 1095))
-					line_style 	3
-					origin_attachment 	(2290, 1230)
-					terminal_attachment 	(1802, 1095))))
-			    (object AssociationViewNew "$UNNAMED$0" @27
-				location   	(1977, 2291)
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3A06E0B50036"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$1" @28
-					Parent_View 	@27
-					location   	(745, -13)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C4"
-					client     	@27
-					supplier   	@19
-					line_style 	3
-					origin_attachment 	(1977, 2291)
-					terminal_attachment 	(1727, 2291))
-				    (object RoleView "eParts" @29
-					Parent_View 	@27
-					location   	(745, -13)
-					label      	(object SegLabel @30
-					    Parent_View 	@29
-					    location   	(2185, 2395)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	144
-					    justify    	0
-					    label      	"+eParts"
-					    pctDist    	0.833856
-					    height     	104
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3A06E0B600C5"
-					client     	@27
-					supplier   	@20
-					line_style 	3
-					origin_attachment 	(1977, 2291)
-					terminal_attachment 	(2227, 2291)
-					label      	(object SegLabel @31
-					    Parent_View 	@29
-					    location   	(2185, 2245)
-					    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   	(592, 2256)
-				label      	(object ItemLabel
-				    Parent_View 	@32
-				    location   	(346, 2148)
-				    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   	(288, 1376)
-				label      	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(114, 1348)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	348
-				    justify    	0
-				    label      	"IString")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@33
-				    location   	(114, 1298)
-				    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   	(1472, 1418)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@12
-				vertices   	(list Points
-				    (1472, 1418)
-				    (1472, 1203)))
-			    (object InheritView "" @35
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD63330017D"
-				client     	@3
-				supplier   	@12
-				line_style 	3
-				origin_attachment 	(836, 1492)
-				terminal_attachment 	(836, 1418)
-				drawSupplier 	@34)
-			    (object ClassView "Class" "Logical View::soap::ISOAPBinding" @36
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(704, 96)
-				label      	(object ItemLabel
-				    Parent_View 	@36
-				    location   	(557, 72)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	294
-				    justify    	0
-				    label      	"ISOAPBinding")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@36
-				    location   	(557, 22)
-				    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      	"45E485A2001F"
-				width      	312
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @37
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E4895502BF"
-				client     	@1
-				supplier   	@36
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::soap::ISOAPOperation" @38
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 112)
-				label      	(object ItemLabel
-				    Parent_View 	@38
-				    location   	(1303, 88)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	338
-				    justify    	0
-				    label      	"ISOAPOperation")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@38
-				    location   	(1303, 38)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	338
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E488A50128"
-				width      	356
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E4897F007D"
-				client     	@2
-				supplier   	@38
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::soap::ISOAPHeader" @40
-				ShowCompartmentStereotypes 	TRUE
-				location   	(752, 864)
-				label      	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(610, 840)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"ISOAPHeader")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@40
-				    location   	(610, 790)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	284
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E488E7008C"
-				width      	302
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @41
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E489BC031C"
-				client     	@3
-				supplier   	@40
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::soap::ISOAPHeaderFault" @42
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1984, 368)
-				label      	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(1795, 344)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"ISOAPHeaderFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(1795, 294)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	378
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E488BD03A9"
-				width      	396
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @43
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AD633340038"
-				client     	@4
-				supplier   	@12
-				line_style 	3
-				origin_attachment 	(1921, 1460)
-				terminal_attachment 	(1921, 1418)
-				drawSupplier 	@34)
-			    (object ClassView "Class" "Logical View::soap::ISOAPFault" @44
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(592, 1792)
-				label      	(object ItemLabel
-				    Parent_View 	@44
-				    location   	(469, 1768)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	246
-				    justify    	0
-				    label      	"ISOAPFault")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@44
-				    location   	(469, 1718)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	246
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E488870119"
-				width      	264
-				height     	172
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @45
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E48A08032C"
-				client     	@32
-				supplier   	@44
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::soap::ISOAPBody" @46
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1472, 1776)
-				label      	(object ItemLabel
-				    Parent_View 	@46
-				    location   	(1273, 1724)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	398
-				    justify    	0
-				    label      	"ISOAPBody")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@46
-				    location   	(1273, 1674)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	398
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E4884B0119"
-				compartment 	(object Compartment
-				    Parent_View 	@46
-				    location   	(1273, 1784)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	4
-				    max_width  	0)
-				width      	416
-				height     	228
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @47
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E48A5B00BB"
-				client     	@19
-				supplier   	@46
-				line_style 	0)
-			    (object InheritView "" @48
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45ED078C02FD"
-				client     	@4
-				supplier   	@42
-				line_style 	0)))
-		    (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" @49
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 832)
-				label      	(object ItemLabel
-				    Parent_View 	@49
-				    location   	(647, 751)
-				    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 ClassView "Class" "Logical View::soap::ISOAPAddress" @50
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(848, 256)
-				label      	(object ItemLabel
-				    Parent_View 	@50
-				    location   	(696, 235)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	304
-				    justify    	0
-				    label      	"ISOAPAddress")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@50
-				    location   	(696, 185)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	304
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"45E487E700EA"
-				width      	322
-				height     	166
-				annotation 	8
-				autoResize 	TRUE)
-			    (object InheritView "" @51
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"45E48A7E0109"
-				client     	@49
-				supplier   	@50
-				line_style 	0)))
-		    (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" @52
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1520, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@52
-				    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" @53
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(304, 592)
-				label      	(object ItemLabel
-				    Parent_View 	@53
-				    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" @54
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 1104)
-				label      	(object ItemLabel
-				    Parent_View 	@54
-				    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" @55
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1232, 1264)
-				label      	(object ItemLabel
-				    Parent_View 	@55
-				    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" @56
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(512, 752)
-				label      	(object ItemLabel
-				    Parent_View 	@56
-				    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" @57
-				ShowCompartmentStereotypes 	TRUE
-				IncludeOperation 	TRUE
-				location   	(816, 928)
-				label      	(object ItemLabel
-				    Parent_View 	@57
-				    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" @58
-				ShowCompartmentStereotypes 	TRUE
-				location   	(608, 128)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@58
-				    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 "" @59
-				location   	(608, 305)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@58
-				vertices   	(list Points
-				    (608, 305)
-				    (608, 215)))
-			    (object InheritView "" @60
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3801AB"
-				client     	@53
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(344, 531)
-				terminal_attachment 	(344, 305)
-				drawSupplier 	@59)
-			    (object InheritView "" @61
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A3E0326"
-				client     	@57
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(815, 867)
-				terminal_attachment 	(815, 305)
-				drawSupplier 	@59)
-			    (object InheritView "" @62
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A450041"
-				client     	@54
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(1068, 1043)
-				terminal_attachment 	(1068, 305)
-				drawSupplier 	@59)
-			    (object InheritView "" @63
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4E031F"
-				client     	@56
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(506, 691)
-				terminal_attachment 	(506, 305)
-				drawSupplier 	@59)
-			    (object InheritView "" @64
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE09A4A0020"
-				client     	@55
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(1231, 1203)
-				terminal_attachment 	(1231, 305)
-				drawSupplier 	@59)
-			    (object InheritView "" @65
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"3AE095350098"
-				client     	@52
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(1520, 515)
-				terminal_attachment 	(1520, 305)
-				drawSupplier 	@59)))))
-	    (object Class_Category "xsd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.xsd\\model\\org.eclipse.XSD.cat"
-		quid       	"39ABDC6F01AA"))
-	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" @66
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@66
-			    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" @67
-			location   	(704, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@67
-			    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" @68
-			location   	(1152, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@68
-			    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)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"39E27F080067"))
diff --git a/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore b/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore
deleted file mode 100644
index 02493dd..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore
+++ /dev/null
@@ -1,597 +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"
-        transient="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PortType" eSuperTypes="#//ExtensibleElement #//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:EReference" name="eOperations" upperBound="-1"
-        eType="#//Operation" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Operation" eSuperTypes="#//ExtensibleElement #//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: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="#//ExtensibleElement #//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:EReference" name="eParts" upperBound="-1"
-        eType="#//Part" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Part" eSuperTypes="#//ExtensibleElement #//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 platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDTypeDefinition"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementDeclaration" eType="ecore:EClass platform:/plugin/org.eclipse.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: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: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="eImports" upperBound="-1"
-        eType="#//Import" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eTypes" eType="#//Types"
-        containment="true"/>
-    <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"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Import" eSuperTypes="#//ExtensibleElement #//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 platform:/plugin/org.eclipse.xsd/model/XSD.ecore#//XSDSchema"/>
-    <eOperations name="setSchema">
-      <eParameters name="schema" eType="ecore:EClass platform:/plugin/org.eclipse.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 platform:/plugin/org.eclipse.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 #//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 #//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 #//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 platform:/plugin/org.eclipse.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="#//ExtensibleElement">
-    <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/model/WSDL.genmodel b/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel
deleted file mode 100644
index b0961e6..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel
+++ /dev/null
@@ -1,384 +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-wsdl"
-    editDirectory="/org.eclipse.wst.wsdl.edit/src" editorDirectory="org.eclipse.wst.wsdl.editor/src"
-    modelPluginID="org.eclipse.wst.wsdl" modelName="WSDL" modelPluginClass="" editPluginClass=""
-    editorPluginClass="" nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
-  <foreignModel>WSDL.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="WSDL" basePackage="org.eclipse.wst" disposableProviderFactory="true"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" 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 image="false" 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 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 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" propertySortChoices="true" 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 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" propertySortChoices="true" ecoreFeature="ecore:EReference WSDL.ecore#//Part/typeDefinition"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference WSDL.ecore#//Part/elementDeclaration"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" 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 notify="false" createChild="false" propertySortChoices="true" 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" propertySortChoices="true" 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 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" propertySortChoices="true" 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/eImports"/>
-      <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/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"/>
-      <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" propertySortChoices="true" ecoreFeature="ecore:EReference WSDL.ecore#//Import/eDefinition"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" 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 image="false" 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" propertySortChoices="true" 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" propertySortChoices="true" 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" propertySortChoices="true" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" 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 image="false" ecoreClass="WSDL.ecore#//IBindingInput"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IBindingOutput"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IBindingFault"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IExtensibilityElement"/>
-    <genClasses image="false" 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 image="false" ecoreClass="WSDL.ecore#//IImport"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IList"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IMap"/>
-    <genClasses image="false" ecoreClass="WSDL.ecore#//IURL"/>
-    <genClasses image="false" 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 image="false" ecoreClass="WSDL.ecore#//IIterator"/>
-    <genClasses image="false" 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 image="false" ecoreClass="WSDL.ecore#//MessageReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute WSDL.ecore#//MessageReference/name"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference WSDL.ecore#//MessageReference/eMessage"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/WSDL.mdl b/bundles/org.eclipse.wst.wsdl/model/WSDL.mdl
deleted file mode 100644
index d56f073..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/WSDL.mdl
+++ /dev/null
@@ -1,3850 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    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"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.wst.wsdl\\model\\org.eclipse.wst.WSDL.cat"
-		quid       	"3ADFB8E5021E")
-	    (object Class_Category "xsd"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.xsd\\model\\org.eclipse.XSD.cat"
-		quid       	"39ABDC6F01AA"))
-	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" @1
-			location   	(272, 256)
-			label      	(object ItemLabel
-			    Parent_View 	@1
-			    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" @2
-			location   	(272, 576)
-			label      	(object ItemLabel
-			    Parent_View 	@2
-			    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)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"constraints"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"visibility"
-			value      	("VisibilityKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"VisibilityKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"None"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-only unsettable"
-				value      	4)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Read-write unsettable"
-				value      	5)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	""))))
-	quid       	"39E27F080067"))
diff --git a/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat b/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat
deleted file mode 100644
index f008443..0000000
--- a/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat
+++ /dev/null
@@ -1,7295 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    charSet    	0)
-
-(object Class_Category "wsdl"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    attributes 	(list Attribute_Set
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsPrefix"
-	    value      	"wsdl")
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"nsURI"
-	    value      	"http://www.eclipse.org/wsdl/2003/WSDL")
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"basePackage"
-	    value      	"org.eclipse.wst")
-	(object Attribute
-	    tool       	"Ecore"
-	    name       	"prefix"
-	    value      	"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"
-		    attributes 	(list Attribute_Set
-			(object Attribute
-			    tool       	"Ecore"
-			    name       	"isTransient"
-			    value      	TRUE))
-		    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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A")
-		(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       	"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       	"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       	"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::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"))
-	    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       	"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$14"
-		    quid       	"3C864DFF02EE"
-		    supplier   	"Logical View::wsdl::Definition"
-		    quidu      	"3AD5E43F008E"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$15"
-	    quid       	"3B8BEA27029F"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$16"
-		    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$17"
-	    quid       	"3AD5E60301E2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$18"
-		    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$19"
-	    quid       	"3AD5E6710104"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$20"
-		    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$21"
-	    quid       	"3AD5E6770095"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$22"
-		    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$23"
-	    quid       	"3AD5E67B0311"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$24"
-		    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$25"
-	    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$26"
-		    quid       	"3AD5FD14019E"
-		    supplier   	"Logical View::wsdl::ExtensibleElement"
-		    quidu      	"3AD5FCFA033A"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$27"
-	    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$28"
-		    quid       	"3ADF2E650252"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$29"
-	    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$30"
-		    quid       	"3ADF2EB4013D"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$31"
-	    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$32"
-		    quid       	"3ADF2F95019A"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$33"
-	    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$34"
-		    quid       	"3ADF2FB9020B"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$35"
-	    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$36"
-		    quid       	"3ADF33180388"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$37"
-	    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$38"
-		    quid       	"3ADF340103AB"
-		    supplier   	"Logical View::wsdl::BindingOperation"
-		    quidu      	"3AD5D3CB0145"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)))
-	(object Association "$UNNAMED$39"
-	    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$40"
-		    quid       	"3AE091F801FF"
-		    supplier   	"Logical View::wsdl::BindingFault"
-		    quidu      	"3AE08A9E03A6")))
-	(object Association "$UNNAMED$41"
-	    quid       	"3AEA3D55002D"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$42"
-		    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$43"
-	    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$44"
-		    quid       	"3AEA3E3C01F2"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$45"
-	    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$46"
-		    quid       	"3AEA4131025F"
-		    supplier   	"Logical View::wsdl::Operation"
-		    quidu      	"3AD5C80D03CE")))
-	(object Association "$UNNAMED$47"
-	    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$48"
-		    quid       	"3B84AD250084"
-		    supplier   	"Logical View::wsdl::BindingInput"
-		    quidu      	"3AE08A8202D4")))
-	(object Association "$UNNAMED$49"
-	    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$50"
-		    quid       	"3B84AD7A014E"
-		    supplier   	"Logical View::wsdl::BindingOutput"
-		    quidu      	"3AE08A8F028C")))
-	(object Association "$UNNAMED$51"
-	    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$52"
-		    quid       	"3B8B1BE90331"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$53"
-	    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$54"
-		    quid       	"3B8B1C140026"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$55"
-	    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$56"
-		    quid       	"3B8B1DCE027A"
-		    supplier   	"Logical View::wsdl::Import"
-		    quidu      	"3AD5E4F903DE")))
-	(object Association "$UNNAMED$57"
-	    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$58"
-		    quid       	"3C4682960118"
-		    supplier   	"Logical View::wsdl::Part"
-		    quidu      	"3AD5CE1C032E")))
-	(object Association "$UNNAMED$59"
-	    quid       	"3CC3614500F2"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$60"
-		    quid       	"3CC36146023D"
-		    supplier   	"Logical View::wsdl::XSDSchemaExtensibilityElement"
-		    quidu      	"3CC360D7039C"
-		    client_cardinality 	(value cardinality "1..1")
-		    is_aggregate 	TRUE)
-		(object Role "schema"
-		    quid       	"3CC36146023E"
-		    label      	"schema"
-		    supplier   	"Logical View::xsd::XSDSchema"
-		    quidu      	"374B182500BB"
-		    client_cardinality 	(value cardinality "0..1")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE)))
-	(object Association "$UNNAMED$61"
-	    quid       	"3F74E78401B1"
-	    roles      	(list role_list
-		(object Role "eMessage"
-		    quid       	"3F74E786000F"
-		    label      	"eMessage"
-		    supplier   	"Logical View::wsdl::Message"
-		    quidu      	"3AD5C9590078"
-		    client_cardinality 	(value cardinality "1")
-		    is_navigable 	TRUE)
-		(object Role "$UNNAMED$62"
-		    quid       	"3F74E7860023"
-		    supplier   	"Logical View::wsdl::MessageReference"
-		    quidu      	"3F6771DB02DC")))
-	(object Association "$UNNAMED$63"
-	    quid       	"3F7896A2026E"
-	    roles      	(list role_list
-		(object Role "$UNNAMED$64"
-		    quid       	"3F7896A7012B"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "1")
-		    is_aggregate 	TRUE)
-		(object Role "children"
-		    quid       	"3F7896A7012C"
-		    label      	"children"
-		    supplier   	"Logical View::wsdl::UnknownExtensibilityElement"
-		    quidu      	"3CB24AC002AE"
-		    client_cardinality 	(value cardinality "0..n")
-		    Containment 	"By Value"
-		    is_navigable 	TRUE))))
-    logical_presentations 	(list unit_reference_list
-	(object ClassDiagram "2.7 Services"
-	    quid       	"39AD3EF60127"
-	    title      	"2.7 Services"
-	    zoom       	90
-	    max_height 	28350
-	    max_width  	21600
-	    origin_x   	0
-	    origin_y   	0
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::IBinding" @1
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1424, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 660)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"IBinding")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@1
-			location   	(1173, 610)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	502
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84ABC60219"
-		    width      	520
-		    height     	404
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IPort" @2
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(816, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 481)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"IPort")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@2
-			location   	(686, 431)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	260
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB800326"
-		    width      	278
-		    height     	218
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::IService" @3
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 90)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"IService")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@3
-			location   	(126, 40)
-			fill_color 	13434879
-			anchor     	10
-			nlines     	1
-			max_width  	228
-			justify    	0
-			label      	"<<Interface>>")
-		    icon       	"Interface"
-		    icon_style 	"Label"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3B84AB490287"
-		    width      	246
-		    height     	264
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::Service" @4
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(240, 528)
-		    label      	(object ItemLabel
-			Parent_View 	@4
-			location   	(44, 433)
-			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     	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, 1169)
-			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     	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"
-		    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"
-		    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   	(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"
-		    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"
-		    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"
-		    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"
-		    width      	314
-		    height     	274
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$47" @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$48" @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$49" @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$50" @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   	(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$27" @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$28" @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$29" @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$30" @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$37" @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$38" @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$39" @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$40" @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$45" @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$46" @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$35" @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$36" @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$31" @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$32" @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$33" @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$34" @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"
-		    compartment 	(object Compartment
-			Parent_View 	@153
-			location   	(1193, 2526)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	1
-			max_width  	0)
-		    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, 1105)
-			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     	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"
-		    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"
-		    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"
-		    width      	528
-		    height     	426
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$15" @170
-		    location   	(1358, 860)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$16" @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$13" @177
-		    location   	(1612, 595)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$14" @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$17" @185
-		    location   	(1279, 1136)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E60301E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$18" @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$19" @193
-		    location   	(1212, 1159)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6710104"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$20" @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$21" @201
-		    location   	(1114, 1585)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E6770095"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$22" @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"
-		    width      	442
-		    height     	182
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$23" @210
-		    location   	(1066, 1532)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5E67B0311"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$24" @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   	564
-	    items      	(list diagram_item_list
-		(object ClassView "Class" "Logical View::wsdl::Port" @219
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(3360, 2528)
-		    label      	(object ItemLabel
-			Parent_View 	@219
-			location   	(3279, 2476)
-			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" @220
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(3168, 2352)
-		    label      	(object ItemLabel
-			Parent_View 	@220
-			location   	(3087, 2299)
-			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::IExtensibilityElement" @221
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2784, 208)
-		    label      	(object ItemLabel
-			Parent_View 	@221
-			location   	(2391, 184)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	786
-			justify    	0
-			label      	"IExtensibilityElement")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@221
-			location   	(2391, 134)
-			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::Types" @222
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(528, 2432)
-		    label      	(object ItemLabel
-			Parent_View 	@222
-			location   	(447, 2380)
-			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" @223
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1072, 736)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@223
-			location   	(801, 628)
-			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 	@223
-			location   	(801, 689)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	534)
-		    width      	560
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @224
-		    location   	(1022, 2056)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@223
-		    vertices   	(list Points
-			(1022, 2056)
-			(1022, 856)))
-		(object InheritView "" @225
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@222
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(472, 2368)
-		    terminal_attachment 	(472, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @226
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(2800, 736)
-		    label      	(object ItemLabel
-			Parent_View 	@226
-			location   	(2528, 631)
-			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 	@226
-			location   	(2528, 692)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	465)
-		    width      	563
-		    height     	234
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object AssociationViewNew "$UNNAMED$25" @227
-		    location   	(1935, 720)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$26" @228
-			    Parent_View 	@227
-			    location   	(767, 608)
-			    label      	(object SegLabel @229
-				Parent_View 	@228
-				location   	(1469, 679)
-				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     	@227
-			    supplier   	@223
-			    line_style 	3
-			    origin_attachment 	(1935, 720)
-			    terminal_attachment 	(1352, 720)
-			    label      	(object SegLabel @230
-				Parent_View 	@228
-				location   	(1446, 676)
-				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" @231
-			    Parent_View 	@227
-			    location   	(767, 608)
-			    label      	(object SegLabel @232
-				Parent_View 	@231
-				location   	(2155, 570)
-				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     	@227
-			    supplier   	@226
-			    line_style 	3
-			    origin_attachment 	(1935, 720)
-			    terminal_attachment 	(2519, 720)
-			    label      	(object SegLabel @233
-				Parent_View 	@231
-				location   	(2348, 675)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.709402
-				height     	46
-				orientation 	0)
-			    label      	(object SegLabel @234
-				Parent_View 	@231
-				location   	(2303, 812)
-				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" @235
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1680, 240)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@235
-			location   	(1302, 132)
-			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 	@235
-			location   	(1302, 193)
-			icon_style 	"Icon"
-			fill_color 	16777215
-			anchor     	2
-			nlines     	3
-			max_width  	756)
-		    width      	774
-		    height     	240
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritTreeView "" @236
-		    location   	(1674, 519)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@235
-		    vertices   	(list Points
-			(1674, 519)
-			(1674, 360)))
-		(object InheritView "" @237
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84B14903D0"
-		    client     	@226
-		    supplier   	@221
-		    line_style 	3
-		    origin_attachment 	(2911, 619)
-		    terminal_attachment 	(2911, 294))
-		(object InheritView "" @238
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3BDDF53502C3"
-		    client     	@226
-		    supplier   	@235
-		    line_style 	3
-		    origin_attachment 	(2663, 619)
-		    terminal_attachment 	(2663, 519)
-		    drawSupplier 	@236)
-		(object ClassView "Class" "Logical View::wsdl::UnknownExtensibilityElement" @239
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(3088, 1456)
-		    label      	(object ItemLabel
-			Parent_View 	@239
-			location   	(2625, 1351)
-			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 "" @240
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CB24AEC01CB"
-		    client     	@239
-		    supplier   	@226
-		    line_style 	3
-		    origin_attachment 	(2692, 1339)
-		    terminal_attachment 	(2692, 853))
-		(object AssociationViewNew "$UNNAMED$63" @241
-		    location   	(3536, 1782)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F7896A2026E"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$64" @242
-			    Parent_View 	@241
-			    location   	(1504, 390)
-			    label      	(object SegLabel @243
-				Parent_View 	@242
-				location   	(3691, 1428)
-				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     	@241
-			    supplier   	@239
-			    vertices   	(list Points
-				(3536, 1782)
-				(3720, 1782)
-				(3720, 1469)
-				(3560, 1469))
-			    line_style 	3
-			    origin_attachment 	(3536, 1782)
-			    terminal_attachment 	(3560, 1469)
-			    label      	(object SegLabel @244
-				Parent_View 	@242
-				location   	(3627, 1523)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"1"
-				pctDist    	0.900000
-				height     	54
-				orientation 	0))
-			(object RoleView "children" @245
-			    Parent_View 	@241
-			    location   	(1504, 390)
-			    label      	(object SegLabel @246
-				Parent_View 	@245
-				location   	(2970, 1706)
-				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     	@241
-			    supplier   	@239
-			    vertices   	(list Points
-				(3536, 1782)
-				(3087, 1782)
-				(3087, 1573))
-			    line_style 	3
-			    origin_attachment 	(3536, 1782)
-			    terminal_attachment 	(3087, 1573)
-			    label      	(object SegLabel @247
-				Parent_View 	@245
-				location   	(3141, 1639)
-				anchor     	2
-				anchor_loc 	1
-				nlines     	1
-				max_width  	15
-				justify    	0
-				label      	"0..*"
-				pctDist    	0.900000
-				height     	54
-				orientation 	1))))
-		(object ClassView "Class" "Logical View::wsdl::Binding" @248
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2000, 2416)
-		    label      	(object ItemLabel
-			Parent_View 	@248
-			location   	(1918, 2363)
-			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 InheritView "" @249
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA0F02F0"
-		    client     	@248
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(1995, 2351)
-		    terminal_attachment 	(1995, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @250
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FE3C03D4"
-		    client     	@223
-		    supplier   	@235
-		    line_style 	3
-		    origin_attachment 	(1185, 616)
-		    terminal_attachment 	(1185, 519)
-		    drawSupplier 	@236)
-		(object ClassView "Class" "Logical View::wsdl::PortType" @251
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1088, 2432)
-		    label      	(object ItemLabel
-			Parent_View 	@251
-			location   	(990, 2379)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	196
-			justify    	0
-			label      	"PortType")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C7F001A5"
-		    width      	214
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOperation" @252
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2112, 2688)
-		    label      	(object ItemLabel
-			Parent_View 	@252
-			location   	(1939, 2635)
-			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::Fault" @253
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1872, 3360)
-		    label      	(object ItemLabel
-			Parent_View 	@253
-			location   	(1791, 3307)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Fault")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078BE0108"
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingFault" @254
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(3008, 2864)
-		    label      	(object ItemLabel
-			Parent_View 	@254
-			location   	(2880, 2811)
-			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 InheritView "" @255
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE0938602C9"
-		    client     	@254
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(3008, 2799)
-		    terminal_attachment 	(3008, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Import" @256
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(320, 2432)
-		    label      	(object ItemLabel
-			Parent_View 	@256
-			location   	(239, 2379)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Import")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5E4F903DE"
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @257
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5EE58037A"
-		    client     	@256
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(265, 2367)
-		    terminal_attachment 	(265, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Definition" @258
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(144, 2224)
-		    label      	(object ItemLabel
-			Parent_View 	@258
-			location   	(42, 2163)
-			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::Input" @259
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1456, 3360)
-		    label      	(object ItemLabel
-			Parent_View 	@259
-			location   	(1375, 3307)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Input")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE0789F0059"
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingInput" @260
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2336, 2864)
-		    label      	(object ItemLabel
-			Parent_View 	@260
-			location   	(2208, 2811)
-			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 InheritView "" @261
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B59B0072"
-		    client     	@260
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(2336, 2799)
-		    terminal_attachment 	(2336, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Output" @262
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1664, 3360)
-		    label      	(object ItemLabel
-			Parent_View 	@262
-			location   	(1583, 3307)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Output")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AE078B60232"
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object ClassView "Class" "Logical View::wsdl::BindingOutput" @263
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(2672, 2864)
-		    label      	(object ItemLabel
-			Parent_View 	@263
-			location   	(2527, 2811)
-			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 InheritView "" @264
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B85B5A4027E"
-		    client     	@263
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(2672, 2799)
-		    terminal_attachment 	(2672, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Operation" @265
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1264, 2688)
-		    label      	(object ItemLabel
-			Parent_View 	@265
-			location   	(1157, 2635)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	214
-			justify    	0
-			label      	"Operation")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C80D03CE"
-		    width      	232
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @266
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AE9DE98003C"
-		    client     	@265
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(1264, 2623)
-		    terminal_attachment 	(1264, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Part" @267
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(912, 2688)
-		    label      	(object ItemLabel
-			Parent_View 	@267
-			location   	(831, 2635)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	162
-			justify    	0
-			label      	"Part")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5CE1C032E"
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @268
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FDB803D4"
-		    client     	@258
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(208, 2151)
-		    terminal_attachment 	(208, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @269
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B897E230237"
-		    client     	@267
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(905, 2623)
-		    terminal_attachment 	(905, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @270
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5C9B70150"
-		    client     	@251
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(1077, 2367)
-		    terminal_attachment 	(1077, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @271
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD6009202F7"
-		    client     	@252
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(2104, 2623)
-		    terminal_attachment 	(2104, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @272
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FA20025E"
-		    client     	@220
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(3150, 2287)
-		    terminal_attachment 	(3150, 2056)
-		    drawSupplier 	@224)
-		(object InheritView "" @273
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD600CB00AA"
-		    client     	@219
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(3342, 2464)
-		    terminal_attachment 	(3342, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::Message" @274
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(768, 2432)
-		    label      	(object ItemLabel
-			Parent_View 	@274
-			location   	(669, 2379)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	198
-			justify    	0
-			label      	"Message")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3AD5C9590078"
-		    width      	216
-		    height     	130
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @275
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5D05501C4"
-		    client     	@274
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(714, 2367)
-		    terminal_attachment 	(714, 2056)
-		    drawSupplier 	@224)
-		(object ClassView "Class" "Logical View::wsdl::MessageReference" @276
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1648, 2864)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@276
-			location   	(1456, 2781)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	384
-			justify    	0
-			label      	"MessageReference")
-		    icon_style 	"Icon"
-		    line_color 	3342489
-		    fill_color 	13434879
-		    quidu      	"3F6771DB02DC"
-		    compartment 	(object Compartment
-			Parent_View 	@276
-			location   	(1456, 2842)
-			icon_style 	"Icon"
-			fill_color 	13434879
-			anchor     	2
-			nlines     	2
-			max_width  	312)
-		    width      	402
-		    height     	190
-		    annotation 	8
-		    autoResize 	TRUE)
-		(object InheritView "" @277
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F762A6A0308"
-		    client     	@276
-		    supplier   	@223
-		    line_style 	3
-		    origin_attachment 	(1636, 2769)
-		    terminal_attachment 	(1636, 2056)
-		    drawSupplier 	@224)
-		(object InheritTreeView "" @278
-		    location   	(1659, 3055)
-		    line_color 	3342489
-		    fill_color 	13434879
-		    supplier   	@276
-		    vertices   	(list Points
-			(1659, 3055)
-			(1659, 2959)))
-		(object InheritView "" @279
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723500DD"
-		    client     	@262
-		    supplier   	@276
-		    line_style 	3
-		    origin_attachment 	(1680, 3295)
-		    terminal_attachment 	(1680, 3055)
-		    drawSupplier 	@278)
-		(object InheritView "" @280
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67722802E7"
-		    client     	@259
-		    supplier   	@276
-		    line_style 	3
-		    origin_attachment 	(1472, 3295)
-		    terminal_attachment 	(1472, 3055)
-		    drawSupplier 	@278)
-		(object InheritView "" @281
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F67723D0319"
-		    client     	@253
-		    supplier   	@276
-		    line_style 	3
-		    origin_attachment 	(1890, 3295)
-		    terminal_attachment 	(1890, 3055)
-		    drawSupplier 	@278)))
-	(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" @282
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1712, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@282
-			location   	(1422, 177)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	580
-			justify    	0
-			label      	"IImport")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@282
-			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" @283
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(432, 1136)
-		    label      	(object ItemLabel
-			Parent_View 	@283
-			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" @284
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1632, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@284
-			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" @285
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(400, 384)
-		    label      	(object ItemLabel
-			Parent_View 	@285
-			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$41" @286
-		    location   	(309, 786)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3D55002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eNamespaces" @287
-			    Parent_View 	@286
-			    location   	(-91, 258)
-			    label      	(object SegLabel @288
-				Parent_View 	@287
-				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     	@286
-			    supplier   	@283
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 1029)
-			    label      	(object SegLabel @289
-				Parent_View 	@287
-				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 @290
-				Parent_View 	@287
-				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$42" @291
-			    Parent_View 	@286
-			    location   	(-91, 258)
-			    label      	(object SegLabel @292
-				Parent_View 	@291
-				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     	@286
-			    supplier   	@285
-			    line_style 	3
-			    origin_attachment 	(309, 786)
-			    terminal_attachment 	(309, 544)
-			    label      	(object SegLabel @293
-				Parent_View 	@291
-				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" @294
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1472, 720)
-		    label      	(object ItemLabel
-			Parent_View 	@294
-			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$55" @295
-		    location   	(1486, 1001)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1DCC02E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eSchema" @296
-			    Parent_View 	@295
-			    location   	(510, -103)
-			    label      	(object SegLabel @297
-				Parent_View 	@296
-				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     	@295
-			    supplier   	@284
-			    vertices   	(list Points
-				(1486, 1001)
-				(1632, 1001)
-				(1632, 1130))
-			    line_style 	3
-			    origin_attachment 	(1486, 1001)
-			    terminal_attachment 	(1632, 1130)
-			    label      	(object SegLabel @298
-				Parent_View 	@296
-				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$56" @299
-			    Parent_View 	@295
-			    location   	(510, -103)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1DCE027A"
-			    client     	@295
-			    supplier   	@294
-			    line_style 	3
-			    origin_attachment 	(1486, 872)
-			    terminal_attachment 	(1486, 872))))
-		(object AssociationViewNew "$UNNAMED$43" @300
-		    location   	(1087, 403)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AEA3E3A002D"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$44" @301
-			    Parent_View 	@300
-			    location   	(687, -125)
-			    label      	(object SegLabel @302
-				Parent_View 	@301
-				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     	@300
-			    supplier   	@294
-			    vertices   	(list Points
-				(1087, 403)
-				(1364, 403)
-				(1364, 568))
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(1364, 568))
-			(object RoleView "eDefinition" @303
-			    Parent_View 	@300
-			    location   	(687, -125)
-			    label      	(object SegLabel @304
-				Parent_View 	@303
-				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     	@300
-			    supplier   	@285
-			    line_style 	3
-			    origin_attachment 	(1087, 403)
-			    terminal_attachment 	(645, 403)
-			    label      	(object SegLabel @305
-				Parent_View 	@303
-				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$13" @306
-		    location   	(737, 826)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C864DFF02EC"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$14" @307
-			    Parent_View 	@306
-			    location   	(-671, 106)
-			    label      	(object SegLabel @308
-				Parent_View 	@307
-				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     	@306
-			    supplier   	@285
-			    vertices   	(list Points
-				(737, 826)
-				(510, 826)
-				(510, 544))
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(510, 544)
-			    label      	(object SegLabel @309
-				Parent_View 	@307
-				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" @310
-			    Parent_View 	@306
-			    location   	(-671, 106)
-			    label      	(object SegLabel @311
-				Parent_View 	@310
-				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     	@306
-			    supplier   	@294
-			    line_style 	3
-			    origin_attachment 	(737, 826)
-			    terminal_attachment 	(1246, 826)
-			    label      	(object SegLabel @312
-				Parent_View 	@310
-				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 @313
-				Parent_View 	@310
-				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 "" @314
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3F6F200D0340"
-		    client     	@294
-		    supplier   	@282
-		    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" @315
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1232)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@315
-			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" @316
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1136, 1600)
-		    label      	(object ItemLabel
-			Parent_View 	@316
-			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" @317
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1280, 1968)
-		    label      	(object ItemLabel
-			Parent_View 	@317
-			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" @318
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(352, 1184)
-		    label      	(object ItemLabel
-			Parent_View 	@318
-			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$51" @319
-		    location   	(735, 1172)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1BE900C4"
-		    roleview_list 	(list RoleViews
-			(object RoleView "typeDefinition" @320
-			    Parent_View 	@319
-			    location   	(143, 676)
-			    label      	(object SegLabel @321
-				Parent_View 	@320
-				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     	@319
-			    supplier   	@315
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(886, 1172)
-			    label      	(object SegLabel @322
-				Parent_View 	@320
-				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$52" @323
-			    Parent_View 	@319
-			    location   	(143, 676)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1BE90331"
-			    client     	@319
-			    supplier   	@318
-			    line_style 	3
-			    origin_attachment 	(735, 1172)
-			    terminal_attachment 	(585, 1172))))
-		(object AssociationViewNew "$UNNAMED$53" @324
-		    location   	(527, 1592)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8B1C1203B2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "elementDeclaration" @325
-			    Parent_View 	@324
-			    location   	(-65, 1096)
-			    label      	(object SegLabel @326
-				Parent_View 	@325
-				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     	@324
-			    supplier   	@316
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(897, 1592)
-			    label      	(object SegLabel @327
-				Parent_View 	@325
-				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$54" @328
-			    Parent_View 	@324
-			    location   	(-65, 1096)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3B8B1C140026"
-			    client     	@324
-			    supplier   	@318
-			    vertices   	(list Points
-				(527, 1592)
-				(437, 1592)
-				(437, 1313))
-			    line_style 	3
-			    origin_attachment 	(527, 1592)
-			    terminal_attachment 	(437, 1313))))
-		(object AssociationViewNew "$UNNAMED$57" @329
-		    location   	(322, 1911)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3C46829303E5"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eMessage" @330
-			    Parent_View 	@329
-			    location   	(-14, 1191)
-			    label      	(object SegLabel @331
-				Parent_View 	@330
-				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     	@329
-			    supplier   	@317
-			    line_style 	3
-			    origin_attachment 	(322, 1911)
-			    terminal_attachment 	(1013, 1911)
-			    label      	(object SegLabel @332
-				Parent_View 	@330
-				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$58" @333
-			    Parent_View 	@329
-			    location   	(-14, 1191)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3C4682960118"
-			    client     	@329
-			    supplier   	@318
-			    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" @334
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(800, 608)
-		    label      	(object ItemLabel
-			Parent_View 	@334
-			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" @335
-		    ShowCompartmentStereotypes 	TRUE
-		    location   	(176, 160)
-		    label      	(object ItemLabel
-			Parent_View 	@335
-			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$15" @336
-		    location   	(234, 604)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEA27029F"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eTypes" @337
-			    Parent_View 	@336
-			    location   	(-150, 396)
-			    label      	(object SegLabel @338
-				Parent_View 	@337
-				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     	@336
-			    supplier   	@334
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(606, 604)
-			    label      	(object SegLabel @339
-				Parent_View 	@337
-				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$16" @340
-			    Parent_View 	@336
-			    location   	(-150, 396)
-			    label      	(object SegLabel @341
-				Parent_View 	@340
-				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     	@336
-			    supplier   	@335
-			    vertices   	(list Points
-				(234, 604)
-				(174, 604)
-				(174, 225))
-			    line_style 	3
-			    origin_attachment 	(234, 604)
-			    terminal_attachment 	(174, 225)
-			    label      	(object SegLabel @342
-				Parent_View 	@340
-				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" @343
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(640, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@343
-			location   	(525, 203)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	230
-			justify    	0
-			label      	"ITypes")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@343
-			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" @344
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1728, 800)
-		    label      	(object ItemLabel
-			Parent_View 	@344
-			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" @345
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1856, 1216)
-		    label      	(object ItemLabel
-			Parent_View 	@345
-			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" @346
-		    location   	(1826, 975)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3614500F2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$60" @347
-			    Parent_View 	@346
-			    location   	(306, 447)
-			    stereotype 	TRUE
-			    line_color 	3342489
-			    quidu      	"3CC36146023D"
-			    client     	@346
-			    supplier   	@344
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 859)
-			    label      	(object SegLabel @348
-				Parent_View 	@347
-				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" @349
-			    Parent_View 	@346
-			    location   	(306, 447)
-			    label      	(object SegLabel @350
-				Parent_View 	@349
-				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     	@346
-			    supplier   	@345
-			    line_style 	3
-			    origin_attachment 	(1826, 975)
-			    terminal_attachment 	(1826, 1091)
-			    label      	(object SegLabel @351
-				Parent_View 	@349
-				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 "" @352
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CADCD3B0380"
-		    client     	@334
-		    supplier   	@343
-		    line_style 	3
-		    origin_attachment 	(705, 500)
-		    terminal_attachment 	(705, 307))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibleElement" @353
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1056, 224)
-		    font       	(object Font
-			italics    	TRUE)
-		    label      	(object ItemLabel
-			Parent_View 	@353
-			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 "" @354
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B8BEB010311"
-		    client     	@334
-		    supplier   	@353
-		    line_style 	3
-		    origin_attachment 	(854, 500)
-		    terminal_attachment 	(854, 330))
-		(object ClassView "Class" "Logical View::wsdl::ExtensibilityElement" @355
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    location   	(1824, 464)
-		    label      	(object ItemLabel
-			Parent_View 	@355
-			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$25" @356
-		    location   	(1206, 493)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5FD130079"
-		    roleview_list 	(list RoleViews
-			(object RoleView "$UNNAMED$26" @357
-			    Parent_View 	@356
-			    location   	(-586, 237)
-			    label      	(object SegLabel @358
-				Parent_View 	@357
-				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     	@356
-			    supplier   	@353
-			    vertices   	(list Points
-				(1206, 493)
-				(1094, 493)
-				(1094, 330))
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1094, 330)
-			    label      	(object SegLabel @359
-				Parent_View 	@357
-				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" @360
-			    Parent_View 	@356
-			    location   	(-586, 237)
-			    label      	(object SegLabel @361
-				Parent_View 	@360
-				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     	@356
-			    supplier   	@355
-			    line_style 	3
-			    origin_attachment 	(1206, 493)
-			    terminal_attachment 	(1481, 493)
-			    label      	(object SegLabel @362
-				Parent_View 	@360
-				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 @363
-				Parent_View 	@360
-				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 "" @364
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3CC3627F00B7"
-		    client     	@344
-		    supplier   	@355
-		    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" @365
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@365
-			location   	(267, 122)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	362
-			justify    	0
-			label      	"IMessage")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@365
-			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" @366
-		    ShowCompartmentStereotypes 	TRUE
-		    SuppressAttribute 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1328, 224)
-		    label      	(object ItemLabel
-			Parent_View 	@366
-			location   	(1029, 124)
-			fill_color 	13434879
-			nlines     	1
-			max_width  	599
-			justify    	0
-			label      	"IPart")
-		    stereotype 	(object ItemLabel
-			Parent_View 	@366
-			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" @367
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(1312, 816)
-		    label      	(object ItemLabel
-			Parent_View 	@367
-			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 "" @368
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A96D02F1"
-		    client     	@367
-		    supplier   	@366
-		    line_style 	3
-		    origin_attachment 	(1304, 678)
-		    terminal_attachment 	(1304, 386))
-		(object ClassView "Class" "Logical View::wsdl::Message" @369
-		    ShowCompartmentStereotypes 	TRUE
-		    IncludeAttribute 	TRUE
-		    IncludeOperation 	TRUE
-		    location   	(448, 656)
-		    label      	(object ItemLabel
-			Parent_View 	@369
-			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 "" @370
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3B84A8D102BA"
-		    client     	@369
-		    supplier   	@365
-		    line_style 	3
-		    origin_attachment 	(445, 495)
-		    terminal_attachment 	(445, 388))
-		(object AssociationViewNew "$UNNAMED$1" @371
-		    location   	(688, 952)
-		    stereotype 	TRUE
-		    line_color 	3342489
-		    quidu      	"3AD5CEBE00E2"
-		    roleview_list 	(list RoleViews
-			(object RoleView "eParts" @372
-			    Parent_View 	@371
-			    location   	(176, 328)
-			    label      	(object SegLabel @373
-				Parent_View 	@372
-				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     	@371
-			    supplier   	@367
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(1066, 952)
-			    label      	(object SegLabel @374
-				Parent_View 	@372
-				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 @375
-				Parent_View 	@372
-				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" @376
-			    Parent_View 	@371
-			    location   	(176, 328)
-			    label      	(object SegLabel @377
-				Parent_View 	@376
-				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     	@371
-			    supplier   	@369
-			    vertices   	(list Points
-				(688, 952)
-				(445, 952)
-				(445, 817))
-			    line_style 	3
-			    origin_attachment 	(688, 952)
-			    terminal_attachment 	(445, 817)
-			    label      	(object SegLabel @378
-				Parent_View 	@376
-				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/plugin.properties b/bundles/org.eclipse.wst.wsdl/plugin.properties
deleted file mode 100644
index c283743..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.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.
-_UI_IOError_message = IO: {0}
-_UI_ParserError_message = DOM: {0}
-
-_UI_ResourceLoad_progress = Loading WSDL documents 
diff --git a/bundles/org.eclipse.wst.wsdl/plugin.xml b/bundles/org.eclipse.wst.wsdl/plugin.xml
deleted file mode 100644
index 737f7c2..0000000
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ /dev/null
@@ -1,158 +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
-        class="org.eclipse.wst.wsdl.WSDLPackage"
-        genModel="model/WSDL.genmodel"
-        uri="http://www.eclipse.org/wsdl/2003/WSDL">
-		</package>
-	</extension>
-
-	<!-- 
-		This extension is duplicated here to provide for backward compatibility.
-		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/WSDL to
-		http://www.eclipse.org/wsdl/2003/WSDL. 
-	 -->
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-        class="org.eclipse.wst.wsdl.WSDLPackage"
-        genModel="model/WSDL.genmodel"
-        uri="http://www.ibm.com/wsdl/2003/WSDL">
-		</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"
-	        genModel="model/HTTP.genmodel"
-			class="org.eclipse.wst.wsdl.binding.http.HTTPPackage">
-		</package>
-	</extension>
-
-	<!-- 
-		This extension is duplicated here to provide for backward compatibility.
-		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/HTTP to
-		http://www.eclipse.org/wsdl/2003/HTTP. 
-	 -->
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.ibm.com/wsdl/2003/HTTP"
-	        genModel="model/HTTP.genmodel"
-			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"
-	        genModel="model/MIME.genmodel"
-			class="org.eclipse.wst.wsdl.binding.mime.MIMEPackage">
-		</package>
-	</extension>
-
-	<!-- 
-		This extension is duplicated here to provide for backward compatibility.
-		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/MIME to
-		http://www.eclipse.org/wsdl/2003/MIME. 
-	 -->
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.ibm.com/wsdl/2003/MIME"
-	        genModel="model/MIME.genmodel"
-			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"
-	        genModel="model/SOAP.genmodel"
-			class="org.eclipse.wst.wsdl.binding.soap.SOAPPackage">
-		</package>
-	</extension>
-
-	<!-- 
-		This extension is duplicated here to provide for backward compatibility.
-		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/SOAP to
-		http://www.eclipse.org/wsdl/2003/SOAP. 
-	 -->
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package
-			uri="http://www.ibm.com/wsdl/2003/SOAP"
-	        genModel="model/SOAP.genmodel"
-			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 052a447..0000000
--- 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 924557e..0000000
--- 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/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 91a828f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPAddress.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 68b1bd8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPBinding.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 ce828db..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 = org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPFactoryImpl.init();
-
-  /**
-   * 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 c8295fe..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPOperation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 a6cca91..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
+++ /dev/null
@@ -1,753 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- * @model kind="package"
- * @generated
- */
-public interface HTTPPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "http"; //$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/wsdl/2003/HTTP"; //$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "http"; //$NON-NLS-1$
-
-  /**
-   * 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.internal.impl.HTTPBindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPBindingImpl
-   * @see org.eclipse.wst.wsdl.binding.http.internal.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 '<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.internal.impl.HTTPOperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPOperationImpl
-   * @see org.eclipse.wst.wsdl.binding.http.internal.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 '<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.internal.impl.HTTPUrlReplacementImpl <em>Url Replacement</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlReplacementImpl
-   * @see org.eclipse.wst.wsdl.binding.http.internal.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 '<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.internal.impl.HTTPUrlEncodedImpl <em>Url Encoded</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlEncodedImpl
-   * @see org.eclipse.wst.wsdl.binding.http.internal.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 '<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.internal.impl.HTTPAddressImpl <em>Address</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPAddressImpl
-   * @see org.eclipse.wst.wsdl.binding.http.internal.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 '<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.internal.impl.HTTPPackageImpl#getIHTTPAddress()
-   * @generated
-   */
-  int IHTTP_ADDRESS = 5;
-
-  /**
-   * The number of structural features of 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.internal.impl.HTTPPackageImpl#getIHTTPBinding()
-   * @generated
-   */
-  int IHTTP_BINDING = 6;
-
-  /**
-   * The number of structural features of 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.internal.impl.HTTPPackageImpl#getIHTTPOperation()
-   * @generated
-   */
-  int IHTTP_OPERATION = 7;
-
-  /**
-   * The number of structural features of 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.internal.impl.HTTPPackageImpl#getIHTTPUrlEncoded()
-   * @generated
-   */
-  int IHTTP_URL_ENCODED = 8;
-
-  /**
-   * The number of structural features of 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.internal.impl.HTTPPackageImpl#getIHTTPUrlReplacement()
-   * @generated
-   */
-  int IHTTP_URL_REPLACEMENT = 9;
-
-  /**
-   * The number of structural features of 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();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPBindingImpl <em>Binding</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPBindingImpl
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl#getHTTPBinding()
-     * @generated
-     */
-    EClass HTTP_BINDING = eINSTANCE.getHTTPBinding();
-
-    /**
-     * The meta object literal for the '<em><b>Verb</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute HTTP_BINDING__VERB = eINSTANCE.getHTTPBinding_Verb();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPOperationImpl <em>Operation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPOperationImpl
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl#getHTTPOperation()
-     * @generated
-     */
-    EClass HTTP_OPERATION = eINSTANCE.getHTTPOperation();
-
-    /**
-     * The meta object literal for the '<em><b>Location URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute HTTP_OPERATION__LOCATION_URI = eINSTANCE.getHTTPOperation_LocationURI();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlReplacementImpl <em>Url Replacement</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlReplacementImpl
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl#getHTTPUrlReplacement()
-     * @generated
-     */
-    EClass HTTP_URL_REPLACEMENT = eINSTANCE.getHTTPUrlReplacement();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlEncodedImpl <em>Url Encoded</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPUrlEncodedImpl
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl#getHTTPUrlEncoded()
-     * @generated
-     */
-    EClass HTTP_URL_ENCODED = eINSTANCE.getHTTPUrlEncoded();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPAddressImpl <em>Address</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPAddressImpl
-     * @see org.eclipse.wst.wsdl.binding.http.internal.impl.HTTPPackageImpl#getHTTPAddress()
-     * @generated
-     */
-    EClass HTTP_ADDRESS = eINSTANCE.getHTTPAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Location URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute HTTP_ADDRESS__LOCATION_URI = eINSTANCE.getHTTPAddress_LocationURI();
-
-    /**
-     * The meta object literal 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.internal.impl.HTTPPackageImpl#getIHTTPAddress()
-     * @generated
-     */
-    EClass IHTTP_ADDRESS = eINSTANCE.getIHTTPAddress();
-
-    /**
-     * The meta object literal 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.internal.impl.HTTPPackageImpl#getIHTTPBinding()
-     * @generated
-     */
-    EClass IHTTP_BINDING = eINSTANCE.getIHTTPBinding();
-
-    /**
-     * The meta object literal 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.internal.impl.HTTPPackageImpl#getIHTTPOperation()
-     * @generated
-     */
-    EClass IHTTP_OPERATION = eINSTANCE.getIHTTPOperation();
-
-    /**
-     * The meta object literal 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.internal.impl.HTTPPackageImpl#getIHTTPUrlEncoded()
-     * @generated
-     */
-    EClass IHTTP_URL_ENCODED = eINSTANCE.getIHTTPUrlEncoded();
-
-    /**
-     * The meta object literal 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.internal.impl.HTTPPackageImpl#getIHTTPUrlReplacement()
-     * @generated
-     */
-    EClass IHTTP_URL_REPLACEMENT = eINSTANCE.getIHTTPUrlReplacement();
-
-  }
-
-} //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 641e591..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlEncoded.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 74452bc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPUrlReplacement.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 46aa513..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/generator/HTTPContentGenerator.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 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";
-  }
-}
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 cb64842..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.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.Literals.HTTP_ADDRESS;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-      return getLocationURI();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-      setLocationURI((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-      setLocationURI(LOCATION_URI_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_ADDRESS__LOCATION_URI:
-      return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: "); //$NON-NLS-1$
-    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.Literals.HTTP_ADDRESS__LOCATION_URI)
-        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 b6e9021..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.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.Literals.HTTP_BINDING;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_BINDING__VERB:
-      return getVerb();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_BINDING__VERB:
-      setVerb((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_BINDING__VERB:
-      setVerb(VERB_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_BINDING__VERB:
-      return VERB_EDEFAULT == null ? verb != null : !VERB_EDEFAULT.equals(verb);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (verb: "); //$NON-NLS-1$
-    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.Literals.HTTP_BINDING__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 e827d39..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.binding.http.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class HTTPFactoryImpl extends EFactoryImpl implements HTTPFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static HTTPFactory init()
-  {
-    try
-    {
-      HTTPFactory theHTTPFactory = (HTTPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/HTTP"); //$NON-NLS-1$ 
-      if (theHTTPFactory != null)
-      {
-        return theHTTPFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new HTTPFactoryImpl();
-  }
-
-  /**
-   * Creates an 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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 ad1d06a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.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.Literals.HTTP_OPERATION;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-      return getLocationURI();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-      setLocationURI((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-      setLocationURI(LOCATION_URI_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case HTTPPackage.HTTP_OPERATION__LOCATION_URI:
-      return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: "); //$NON-NLS-1$
-    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.Literals.HTTP_OPERATION__LOCATION_URI)
-        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 3bf6a1d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.xsd.XSDPackage;
-
-
-/**
- * <!-- 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.getEPackage(HTTPPackage.eNS_URI);
-
-    // Obtain or create and register package
-    HTTPPackageImpl theHTTPPackage = (HTTPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof HTTPPackageImpl
-      ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new HTTPPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    WSDLPackage.eINSTANCE.eClass();
-    XSDPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theHTTPPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theHTTPPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theHTTPPackage.freeze();
-
-    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
-    WSDLPackage theWSDLPackage = (WSDLPackage)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, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getHTTPBinding_Verb(),
-      ecorePackage.getEString(),
-      "verb", null, 0, 1, HTTPBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(httpOperationEClass, HTTPOperation.class, "HTTPOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getHTTPOperation_LocationURI(),
-      ecorePackage.getEString(),
-      "locationURI", null, 0, 1, HTTPOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(
-      httpUrlReplacementEClass,
-      HTTPUrlReplacement.class,
-      "HTTPUrlReplacement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(httpUrlEncodedEClass, HTTPUrlEncoded.class, "HTTPUrlEncoded", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(httpAddressEClass, HTTPAddress.class, "HTTPAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getHTTPAddress_LocationURI(),
-      ecorePackage.getEString(),
-      "locationURI", null, 0, 1, HTTPAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(
-      ihttpAddressEClass,
-      javax.wsdl.extensions.http.HTTPAddress.class,
-      "IHTTPAddress", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      ihttpBindingEClass,
-      javax.wsdl.extensions.http.HTTPBinding.class,
-      "IHTTPBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      ihttpOperationEClass,
-      javax.wsdl.extensions.http.HTTPOperation.class,
-      "IHTTPOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      ihttpUrlEncodedEClass,
-      javax.wsdl.extensions.http.HTTPUrlEncoded.class,
-      "IHTTPUrlEncoded", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      ihttpUrlReplacementEClass,
-      javax.wsdl.extensions.http.HTTPUrlReplacement.class,
-      "IHTTPUrlReplacement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    // 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 11777be..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlEncodedImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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;
-
-
-/**
- * <!-- 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.Literals.HTTP_URL_ENCODED;
-  }
-
-  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 34964ce..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPUrlReplacementImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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;
-
-
-/**
- * <!-- 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.Literals.HTTP_URL_REPLACEMENT;
-  }
-
-  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 cbc02df..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-
-/**
- * <!-- 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 18a1ff3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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"; //$NON-NLS-1$
-
-  public static final String BINDING_ELEMENT_TAG = "binding"; //$NON-NLS-1$
-
-  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
-
-  public static final String URL_ENCODED_ELEMENT_TAG = "urlEncoded"; //$NON-NLS-1$
-
-  public static final String URL_REPLACEMENT_ELEMENT_TAG = "urlReplacement"; //$NON-NLS-1$
-
-  public static final String HTTP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/http/"; //$NON-NLS-1$
-
-  public static final String LOCATION_URI_ATTRIBUTE = "location"; //$NON-NLS-1$
-
-  public static final String VERB_ATTRIBUTE = "verb"; //$NON-NLS-1$
-
-  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 8497f98..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPExtensibilityElementFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 9c1de18..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
+++ /dev/null
@@ -1,413 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-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.*;
-
-
-/**
- * <!-- 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)
-  {
-    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 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);
-    }
-  }
-
-  /**
-   * 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/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 91903c0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEContent.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 kind="operation"
-   * @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 bdc4a81..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 = org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEFactoryImpl.init();
-
-  /**
-   * 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 892d8c8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMimeXml.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 kind="operation"
-   * @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 64650b7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEMultipartRelated.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 kind="operation" dataType="org.eclipse.wst.wsdl.binding.mime.List" many="false"
-   * @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 c9372d5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
+++ /dev/null
@@ -1,727 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- * @model kind="package"
- * @generated
- */
-public interface MIMEPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "mime"; //$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/wsdl/2003/MIME"; //$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "mime"; //$NON-NLS-1$
-
-  /**
-   * 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.internal.impl.MIMEContentImpl <em>Content</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEContentImpl
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.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 '<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.internal.impl.MIMEPartImpl <em>Part</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPartImpl
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.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 feature id for the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MIME_PART__EEXTENSIBILITY_ELEMENTS = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Part</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MIME_PART_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMultipartRelatedImpl <em>Multipart Related</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMultipartRelatedImpl
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.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 '<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.internal.impl.MIMEMimeXmlImpl <em>Mime Xml</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMimeXmlImpl
-   * @see org.eclipse.wst.wsdl.binding.mime.internal.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 '<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.internal.impl.MIMEPackageImpl#getIMIMEPart()
-   * @generated
-   */
-  int IMIME_PART = 4;
-
-  /**
-   * The number of structural features of 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.internal.impl.MIMEPackageImpl#getIMIMEMultipartRelated()
-   * @generated
-   */
-  int IMIME_MULTIPART_RELATED = 5;
-
-  /**
-   * The number of structural features of 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.internal.impl.MIMEPackageImpl#getIMIMEContent()
-   * @generated
-   */
-  int IMIME_CONTENT = 6;
-
-  /**
-   * The number of structural features of 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.internal.impl.MIMEPackageImpl#getIMIMEMimeXml()
-   * @generated
-   */
-  int IMIME_MIME_XML = 7;
-
-  /**
-   * The number of structural features of 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.internal.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 the containment reference list '{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart#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.binding.mime.MIMEPart#getEExtensibilityElements()
-   * @see #getMIMEPart()
-   * @generated
-   */
-  EReference getMIMEPart_EExtensibilityElements();
-
-  /**
-   * 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();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEContentImpl <em>Content</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEContentImpl
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl#getMIMEContent()
-     * @generated
-     */
-    EClass MIME_CONTENT = eINSTANCE.getMIMEContent();
-
-    /**
-     * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MIME_CONTENT__TYPE = eINSTANCE.getMIMEContent_Type();
-
-    /**
-     * The meta object literal for the '<em><b>EPart</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MIME_CONTENT__EPART = eINSTANCE.getMIMEContent_EPart();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPartImpl <em>Part</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPartImpl
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl#getMIMEPart()
-     * @generated
-     */
-    EClass MIME_PART = eINSTANCE.getMIMEPart();
-
-    /**
-     * The meta object literal for the '<em><b>EExtensibility Elements</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MIME_PART__EEXTENSIBILITY_ELEMENTS = eINSTANCE.getMIMEPart_EExtensibilityElements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMultipartRelatedImpl <em>Multipart Related</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMultipartRelatedImpl
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl#getMIMEMultipartRelated()
-     * @generated
-     */
-    EClass MIME_MULTIPART_RELATED = eINSTANCE.getMIMEMultipartRelated();
-
-    /**
-     * The meta object literal for the '<em><b>EMIME Part</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MIME_MULTIPART_RELATED__EMIME_PART = eINSTANCE.getMIMEMultipartRelated_EMIMEPart();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMimeXmlImpl <em>Mime Xml</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEMimeXmlImpl
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl#getMIMEMimeXml()
-     * @generated
-     */
-    EClass MIME_MIME_XML = eINSTANCE.getMIMEMimeXml();
-
-    /**
-     * The meta object literal for the '<em><b>EPart</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MIME_MIME_XML__EPART = eINSTANCE.getMIMEMimeXml_EPart();
-
-    /**
-     * The meta object literal 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.internal.impl.MIMEPackageImpl#getIMIMEPart()
-     * @generated
-     */
-    EClass IMIME_PART = eINSTANCE.getIMIMEPart();
-
-    /**
-     * The meta object literal 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.internal.impl.MIMEPackageImpl#getIMIMEMultipartRelated()
-     * @generated
-     */
-    EClass IMIME_MULTIPART_RELATED = eINSTANCE.getIMIMEMultipartRelated();
-
-    /**
-     * The meta object literal 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.internal.impl.MIMEPackageImpl#getIMIMEContent()
-     * @generated
-     */
-    EClass IMIME_CONTENT = eINSTANCE.getIMIMEContent();
-
-    /**
-     * The meta object literal 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.internal.impl.MIMEPackageImpl#getIMIMEMimeXml()
-     * @generated
-     */
-    EClass IMIME_MIME_XML = eINSTANCE.getIMIMEMimeXml();
-
-    /**
-     * The meta object literal for the '<em>List</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see java.util.List
-     * @see org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPackageImpl#getList()
-     * @generated
-     */
-    EDataType LIST = eINSTANCE.getList();
-
-  }
-
-} //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 4924ab4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPart.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.emf.common.util.EList;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Part</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.MIMEPart#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.mime.MIMEPackage#getMIMEPart()
- * @model superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.mime.IMIMEPart"
- * @generated
- */
-public interface MIMEPart extends ExtensibilityElement, javax.wsdl.extensions.mime.MIMEPart
-{
-  /**
-   * Returns the value of the '<em><b>EExtensibility Elements</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wst.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.wst.wsdl.binding.mime.MIMEPackage#getMIMEPart_EExtensibilityElements()
-   * @model type="org.eclipse.wst.wsdl.ExtensibilityElement" containment="true"
-   * @generated
-   */
-  EList getEExtensibilityElements();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model extensibilityElementType="org.eclipse.wst.wsdl.IExtensibilityElement"
-   * @generated
-   */
-  void addExtensibilityElement(javax.wsdl.extensions.ExtensibilityElement extensibilityElement);
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model kind="operation" dataType="org.eclipse.wst.wsdl.binding.mime.List" many="false"
-   * @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 7aac308..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.impl.MIMEContentImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.internal.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.Literals.MIME_CONTENT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEPart = (InternalEObject)ePart;
-      ePart = (Part)eResolveProxy(oldEPart);
-      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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_CONTENT__TYPE:
-      return getType();
-      case MIMEPackage.MIME_CONTENT__EPART:
-      if (resolve)
-        return getEPart();
-      return basicGetEPart();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_CONTENT__TYPE:
-      setType((String)newValue);
-      return;
-      case MIMEPackage.MIME_CONTENT__EPART:
-      setEPart((Part)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_CONTENT__TYPE:
-      setType(TYPE_EDEFAULT);
-      return;
-      case MIMEPackage.MIME_CONTENT__EPART:
-      setEPart((Part)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_CONTENT__TYPE:
-      return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-      case MIMEPackage.MIME_CONTENT__EPART:
-      return ePart != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (type: "); //$NON-NLS-1$
-    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.Literals.MIME_CONTENT__EPART)
-        niceSetAttribute(theElement, MIMEConstants.PART_ATTRIBUTE, getPart());
-      if (eAttribute == null || eAttribute == MIMEPackage.Literals.MIME_CONTENT__TYPE)
-        niceSetAttribute(theElement, MIMEConstants.TYPE_ATTRIBUTE, getType());
-    }
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(MIMEConstants.MIME_NAMESPACE_URI, MIMEConstants.CONTENT_ELEMENT_TAG);
-    return elementType;
-  }
-
-} //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 e51bcad..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.binding.mime.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MIMEFactoryImpl extends EFactoryImpl implements MIMEFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static MIMEFactory init()
-  {
-    try
-    {
-      MIMEFactory theMIMEFactory = (MIMEFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/MIME"); //$NON-NLS-1$ 
-      if (theMIMEFactory != null)
-      {
-        return theMIMEFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new MIMEFactoryImpl();
-  }
-
-  /**
-   * Creates an 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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 1df9577..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMimeXmlImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.internal.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.Literals.MIME_MIME_XML;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Part getEPart()
-  {
-    if (ePart != null && ePart.eIsProxy())
-    {
-      InternalEObject oldEPart = (InternalEObject)ePart;
-      ePart = (Part)eResolveProxy(oldEPart);
-      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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MIME_XML__EPART:
-      if (resolve)
-        return getEPart();
-      return basicGetEPart();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MIME_XML__EPART:
-      setEPart((Part)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MIME_XML__EPART:
-      setEPart((Part)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MIME_XML__EPART:
-      return ePart != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  //
-  // 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.Literals.MIME_CONTENT__EPART)
-        niceSetAttribute(theElement, MIMEConstants.PART_ATTRIBUTE, getPart());
-    }
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(MIMEConstants.MIME_NAMESPACE_URI, MIMEConstants.MIME_XML_ELEMENT_TAG);
-    return elementType;
-  }
-} //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 1854f2d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEMultipartRelatedImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Collection;
-import java.util.Iterator;
-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.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-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.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>Multipart Related</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.internal.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;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MIMEMultipartRelatedImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return MIMEPackage.Literals.MIME_MULTIPART_RELATED;
-  }
-
-  /**
-   * <!-- 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 NOT
-   */
-  public List getMIMEParts()
-  {
-    return getEMIMEPart();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-      return ((InternalEList)getEMIMEPart()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-      return getEMIMEPart();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-      getEMIMEPart().clear();
-      getEMIMEPart().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-      getEMIMEPart().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_MULTIPART_RELATED__EMIME_PART:
-      return eMIMEPart != null && !eMIMEPart.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  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);
-    }
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(MIMEConstants.MIME_NAMESPACE_URI, MIMEConstants.MULTIPART_RELATED_ELEMENT_TAG);
-    return elementType;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl#createElement()
-   */
-  public Element createElement()
-  {
-    Element newElement = super.createElement();
-
-    Iterator iterator = getMIMEParts().iterator();
-    while (iterator.hasNext())
-    {
-      Object obj = iterator.next();
-      if (obj instanceof MIMEPart)
-      {
-        MIMEPart mimePart = (MIMEPart)obj;
-        Element child = ((MIMEPartImpl)mimePart).createElement();
-        newElement.appendChild(child);
-      }
-    }
-    return newElement;
-  }
-} //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 73dae71..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
+++ /dev/null
@@ -1,496 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.xsd.XSDPackage;
-
-
-/**
- * <!-- 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.getEPackage(MIMEPackage.eNS_URI);
-
-    // Obtain or create and register package
-    MIMEPackageImpl theMIMEPackage = (MIMEPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MIMEPackageImpl
-      ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MIMEPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    WSDLPackage.eINSTANCE.eClass();
-    XSDPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theMIMEPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theMIMEPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theMIMEPackage.freeze();
-
-    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 EReference getMIMEPart_EExtensibilityElements()
-  {
-    return (EReference)mimePartEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- 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);
-    createEReference(mimePartEClass, MIME_PART__EEXTENSIBILITY_ELEMENTS);
-
-    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
-    WSDLPackage theWSDLPackage = (WSDLPackage)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, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getMIMEContent_Type(),
-      ecorePackage.getEString(),
-      "type", null, 0, 1, MIMEContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-      getMIMEContent_EPart(),
-      theWSDLPackage.getPart(),
-      null,
-      "ePart", null, 0, 1, MIMEContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    EOperation op = addEOperation(mimeContentEClass, null, "setPart"); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "part", 0, 1); //$NON-NLS-1$
-
-    addEOperation(mimeContentEClass, ecorePackage.getEString(), "getPart", 0, 1); //$NON-NLS-1$
-
-    initEClass(mimePartEClass, MIMEPart.class, "MIMEPart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-      getMIMEPart_EExtensibilityElements(),
-      theWSDLPackage.getExtensibilityElement(),
-      null,
-      "eExtensibilityElements", null, 0, -1, MIMEPart.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    op = addEOperation(mimePartEClass, null, "addExtensibilityElement"); //$NON-NLS-1$
-    addEParameter(op, theWSDLPackage.getIExtensibilityElement(), "extensibilityElement", 0, 1); //$NON-NLS-1$
-
-    addEOperation(mimePartEClass, this.getList(), "getExtensibilityElements", 0, 1); //$NON-NLS-1$
-
-    initEClass(
-      mimeMultipartRelatedEClass,
-      MIMEMultipartRelated.class,
-      "MIMEMultipartRelated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-      getMIMEMultipartRelated_EMIMEPart(),
-      this.getMIMEPart(),
-      null,
-      "eMIMEPart", null, 0, -1, MIMEMultipartRelated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    op = addEOperation(mimeMultipartRelatedEClass, null, "addMIMEPart"); //$NON-NLS-1$
-    addEParameter(op, this.getIMIMEPart(), "mimePart", 0, 1); //$NON-NLS-1$
-
-    addEOperation(mimeMultipartRelatedEClass, this.getList(), "getMIMEParts", 0, 1); //$NON-NLS-1$
-
-    initEClass(mimeMimeXmlEClass, MIMEMimeXml.class, "MIMEMimeXml", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-      getMIMEMimeXml_EPart(),
-      theWSDLPackage.getPart(),
-      null,
-      "ePart", null, 0, 1, MIMEMimeXml.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    op = addEOperation(mimeMimeXmlEClass, null, "setPart"); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "part", 0, 1); //$NON-NLS-1$
-
-    addEOperation(mimeMimeXmlEClass, ecorePackage.getEString(), "getPart", 0, 1); //$NON-NLS-1$
-
-    initEClass(
-      imimePartEClass,
-      javax.wsdl.extensions.mime.MIMEPart.class,
-      "IMIMEPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      imimeMultipartRelatedEClass,
-      javax.wsdl.extensions.mime.MIMEMultipartRelated.class,
-      "IMIMEMultipartRelated", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      imimeContentEClass,
-      javax.wsdl.extensions.mime.MIMEContent.class,
-      "IMIMEContent", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      imimeMimeXmlEClass,
-      javax.wsdl.extensions.mime.MIMEMimeXml.class,
-      "IMIMEMimeXml", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    // Initialize data types
-    initEDataType(listEDataType, List.class, "List", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    // 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 7baafca..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPartImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-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.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
-import org.eclipse.wst.wsdl.binding.mime.internal.util.MIMEConstants;
-import org.eclipse.wst.wsdl.internal.impl.DefinitionImpl;
-import org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl;
-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>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.wst.wsdl.binding.mime.internal.impl.MIMEPartImpl#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MIMEPartImpl extends ExtensibilityElementImpl implements MIMEPart
-{
-
-  /**
-   * 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;
-
-  /**
-   * 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 MIMEPartImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return MIMEPackage.Literals.MIME_PART;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEExtensibilityElements()
-  {
-    if (eExtensibilityElements == null)
-    {
-      eExtensibilityElements = new EObjectContainmentEList(ExtensibilityElement.class, this, MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS);
-    }
-    return eExtensibilityElements;
-  }
-
-  /**
-   * <!-- 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 getEExtensibilityElements();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS:
-      return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS:
-      return getEExtensibilityElements();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS:
-      getEExtensibilityElements().clear();
-      getEExtensibilityElements().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS:
-      getEExtensibilityElements().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case MIMEPackage.MIME_PART__EEXTENSIBILITY_ELEMENTS:
-      return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  //
-  // 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();
-  }
-
-  public QName getElementType()
-  {
-    if (elementType == null)
-      elementType = new QName(MIMEConstants.MIME_NAMESPACE_URI, MIMEConstants.PART_ELEMENT_TAG);
-    return elementType;
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl#createElement()
-   */
-  public Element createElement()
-  {
-    Element newElement = super.createElement();
-
-    Iterator iterator = getExtensibilityElements().iterator();
-    while (iterator.hasNext())
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement)iterator.next();
-      Element child = ((ExtensibilityElementImpl)extensibilityElement).createElement();
-      newElement.appendChild(child);
-    }
-
-    return newElement;
-  }
-} //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 4c8e4e8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-
-/**
- * <!-- 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 5463278..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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"; //$NON-NLS-1$
-
-  public static final String MIME_XML_ELEMENT_TAG = "mimeXml"; //$NON-NLS-1$
-
-  public static final String MULTIPART_RELATED_ELEMENT_TAG = "multipartRelated"; //$NON-NLS-1$
-
-  public static final String PART_ELEMENT_TAG = "part"; //$NON-NLS-1$
-
-  public static final String MIME_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/mime/"; //$NON-NLS-1$
-
-  public static final String PART_ATTRIBUTE = "part"; //$NON-NLS-1$
-
-  public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
-
-  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 c2cb8c6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEExtensibilityElementFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 b1718b0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-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.*;
-
-
-/**
- * <!-- 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)
-  {
-    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 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);
-    }
-  }
-
-  /**
-   * Returns the result of interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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/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 e8ed0c5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPAddress.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-
-  /**
-   * 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.soap.SOAPPackage#getSOAPAddress_LocationURI()
-   * @model
-   * @generated
-   */
-  String getLocationURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPAddress#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);
-
-} // 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 e5b358b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBinding.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-
-  /**
-   * Returns the value of the '<em><b>Transport URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Transport 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>Transport URI</em>' attribute.
-   * @see #setTransportURI(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBinding_TransportURI()
-   * @model
-   * @generated
-   */
-  String getTransportURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#getTransportURI <em>Transport URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Transport URI</em>' attribute.
-   * @see #getTransportURI()
-   * @generated
-   */
-  void setTransportURI(String value);
-
-  /**
-   * 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(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBinding_Style()
-   * @model
-   * @generated
-   */
-  String getStyle();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBinding#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(String value);
-} // 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 406c0e2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPBody.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-
-/**
- * <!-- 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#getEEncodingStyles <em>EEncoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEParts <em>EParts</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
-{
-
-  /**
-   * 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#getSOAPBody_Use()
-   * @model
-   * @generated
-   */
-  String getUse();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#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#getSOAPBody_NamespaceURI()
-   * @model
-   * @generated
-   */
-  String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#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>EEncoding 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>EEncoding 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>EEncoding Styles</em>' attribute list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBody_EEncodingStyles()
-   * @model type="java.lang.String" dataType="org.eclipse.wst.wsdl.binding.soap.IString"
-   * @generated
-   */
-  EList getEEncodingStyles();
-
-  /**
-   * Returns the value of the '<em><b>EParts</b></em>' reference list.
-   * The list contents are of type {@link org.eclipse.wst.wsdl.Part}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>EParts</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>EParts</em>' reference list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPBody_EParts()
-   * @model type="org.eclipse.wst.wsdl.Part"
-   * @generated
-   */
-  EList getEParts();
-} // 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 af0e365..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFactory.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 = org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-  SOAPBinding createSOAPBinding();
-
-  /**
-   * Returns a new object of class '<em>Body</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Body</em>'.
-   * @generated
-   */
-  SOAPBody createSOAPBody();
-
-  /**
-   * Returns a new object of class '<em>Header Base</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Base</em>'.
-   * @generated
-   */
-  SOAPHeaderBase createSOAPHeaderBase();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-  SOAPFault createSOAPFault();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-  SOAPOperation createSOAPOperation();
-
-  /**
-   * Returns a new object of class '<em>Address</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Address</em>'.
-   * @generated
-   */
-  SOAPAddress createSOAPAddress();
-
-  /**
-   * Returns a new object of class '<em>Header Fault</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header Fault</em>'.
-   * @generated
-   */
-  SOAPHeaderFault createSOAPHeaderFault();
-
-  /**
-   * Returns a new object of class '<em>Header</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Header</em>'.
-   * @generated
-   */
-  SOAPHeader createSOAPHeader();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  SOAPPackage getSOAPPackage();
-} //SOAPFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-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 b345f8f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPFault.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPFault()
- * @model features="eEncodingStyles" 
- *        eEncodingStylesType="java.lang.String" eEncodingStylesDataType="org.eclipse.wst.wsdl.binding.soap.IString" eEncodingStylesMany="true" eEncodingStylesSuppressedGetVisibility="true"
- * @generated
- */
-public interface SOAPFault extends ExtensibilityElement, javax.wsdl.extensions.soap.SOAPFault
-{
-
-  /**
-   * 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#getSOAPFault_Use()
-   * @model
-   * @generated
-   */
-  String getUse();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#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#getSOAPFault_NamespaceURI()
-   * @model
-   * @generated
-   */
-  String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#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>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.wsdl.binding.soap.SOAPPackage#getSOAPFault_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#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);
-
-} // 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 07f1f5e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeader.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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, javax.wsdl.extensions.soap.SOAPHeader
-{
-  /**
-   * 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 447352e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderBase.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-import javax.xml.namespace.QName;
-
-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#getEEncodingStyles <em>EEncoding 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>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEMessage <em>EMessage</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEPart <em>EPart</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>EEncoding 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>EEncoding 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>EEncoding Styles</em>' attribute list.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_EEncodingStyles()
-   * @model type="java.lang.String" dataType="org.eclipse.wst.wsdl.binding.soap.IString"
-   * @generated
-   */
-  EList getEEncodingStyles();
-
-  /**
-   * 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.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_EMessage()
-   * @model required="true"
-   * @generated
-   */
-  Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#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);
-
-  /**
-   * 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.soap.SOAPPackage#getSOAPHeaderBase_EPart()
-   * @model required="true"
-   * @generated
-   */
-  Part getEPart();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#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);
-
-  /**
-   * Returns the value of the '<em><b>Message</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Message</em>' attribute.
-   * @see #setMessage(QName)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Message()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Message</em>' attribute.
-   * @see #getMessage()
-   * @generated
-   */
-  void setMessage(QName value);
-
-  /**
-   * Returns the value of the '<em><b>Part</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Part</em>' attribute.
-   * @see #setPart(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPHeaderBase_Part()
-   * @model
-   * @generated
-   */
-  String getPart();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Part</em>' attribute.
-   * @see #getPart()
-   * @generated
-   */
-  void setPart(String value);
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model kind="operation" many="false"
-   * @generated
-   */
-  List getEncodingStyles();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model encodingStylesMany="false"
-   * @generated
-   */
-  void setEncodingStyles(List encodingStyles);
-
-} // 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 a572a81..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPHeaderFault.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.binding.soap.SOAPPackage#getSOAPHeaderFault()
- * @model
- * @generated
- */
-public interface SOAPHeaderFault extends SOAPHeaderBase, javax.wsdl.extensions.soap.SOAPHeaderFault
-{
-} // 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 91a6a59..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPOperation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
-{
-
-  /**
-   * Returns the value of the '<em><b>Soap Action URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Soap Action 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>Soap Action URI</em>' attribute.
-   * @see #setSoapActionURI(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPOperation_SoapActionURI()
-   * @model
-   * @generated
-   */
-  String getSoapActionURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#getSoapActionURI <em>Soap Action URI</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Soap Action URI</em>' attribute.
-   * @see #getSoapActionURI()
-   * @generated
-   */
-  void setSoapActionURI(String value);
-
-  /**
-   * 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(String)
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPPackage#getSOAPOperation_Style()
-   * @model
-   * @generated
-   */
-  String getStyle();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.wsdl.binding.soap.SOAPOperation#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(String value);
-} // 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 3b73ab8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/SOAPPackage.java
+++ /dev/null
@@ -1,1721 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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
- * @model kind="package"
- * @generated
- */
-public interface SOAPPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "soap"; //$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/wsdl/2003/SOAP"; //$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "soap"; //$NON-NLS-1$
-
-  /**
-   * 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 '<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>EEncoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_BODY__EENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>EParts</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_BODY__EPARTS = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of 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>EEncoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_BASE__EENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' attribute.
-   * <!-- 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>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_BASE__PART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_BASE__EMESSAGE = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The feature id for the '<em><b>EPart</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_BASE__EPART = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The number of structural features of 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 + 7;
-
-  /**
-   * 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>EEncoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_FAULT__EENCODING_STYLES = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_FAULT__NAME = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the '<em>Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_FAULT_FEATURE_COUNT = WSDLPackage.EXTENSIBILITY_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * 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 '<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 '<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>EEncoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_FAULT__EENCODING_STYLES = SOAP_HEADER_BASE__EENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' attribute.
-   * <!-- 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>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_FAULT__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_FAULT__EMESSAGE = SOAP_HEADER_BASE__EMESSAGE;
-
-  /**
-   * The feature id for the '<em><b>EPart</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER_FAULT__EPART = SOAP_HEADER_BASE__EPART;
-
-  /**
-   * The number of structural features of 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>EEncoding Styles</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER__EENCODING_STYLES = SOAP_HEADER_BASE__EENCODING_STYLES;
-
-  /**
-   * The feature id for the '<em><b>Message</b></em>' attribute.
-   * <!-- 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>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER__PART = SOAP_HEADER_BASE__PART;
-
-  /**
-   * The feature id for the '<em><b>EMessage</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER__EMESSAGE = SOAP_HEADER_BASE__EMESSAGE;
-
-  /**
-   * The feature id for the '<em><b>EPart</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SOAP_HEADER__EPART = SOAP_HEADER_BASE__EPART;
-
-  /**
-   * 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 '<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 '{@link javax.wsdl.extensions.soap.SOAPBinding <em>ISOAP Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPBinding
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPBinding()
-   * @generated
-   */
-  int ISOAP_BINDING = 8;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Binding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_BINDING_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPAddress <em>ISOAP Address</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPAddress
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPAddress()
-   * @generated
-   */
-  int ISOAP_ADDRESS = 9;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Address</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_ADDRESS_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPBody <em>ISOAP Body</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPBody
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPBody()
-   * @generated
-   */
-  int ISOAP_BODY = 10;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Body</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_BODY_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPFault <em>ISOAP Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPFault
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPFault()
-   * @generated
-   */
-  int ISOAP_FAULT = 11;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_FAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPOperation <em>ISOAP Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPOperation
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPOperation()
-   * @generated
-   */
-  int ISOAP_OPERATION = 12;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_OPERATION_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPHeaderFault <em>ISOAP Header Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPHeaderFault
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPHeaderFault()
-   * @generated
-   */
-  int ISOAP_HEADER_FAULT = 13;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Header Fault</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_HEADER_FAULT_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link javax.wsdl.extensions.soap.SOAPHeader <em>ISOAP Header</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see javax.wsdl.extensions.soap.SOAPHeader
-   * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPHeader()
-   * @generated
-   */
-  int ISOAP_HEADER = 14;
-
-  /**
-   * The number of structural features of the '<em>ISOAP Header</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ISOAP_HEADER_FEATURE_COUNT = 0;
-
-  /**
-   * 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 = 15;
-
-  /**
-   * 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#getEEncodingStyles <em>EEncoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>EEncoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEEncodingStyles()
-   * @see #getSOAPBody()
-   * @generated
-   */
-  EAttribute getSOAPBody_EEncodingStyles();
-
-  /**
-   * Returns the meta object for the reference list '{@link org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEParts <em>EParts</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference list '<em>EParts</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPBody#getEParts()
-   * @see #getSOAPBody()
-   * @generated
-   */
-  EReference getSOAPBody_EParts();
-
-  /**
-   * 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#getEEncodingStyles <em>EEncoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>EEncoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getEEncodingStyles()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-  EAttribute getSOAPHeaderBase_EEncodingStyles();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage <em>Message</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Message</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getMessage()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-  EAttribute getSOAPHeaderBase_Message();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart <em>Part</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Part</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#getPart()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-  EAttribute getSOAPHeaderBase_Part();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#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.binding.soap.SOAPHeaderBase#getEMessage()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-  EReference getSOAPHeaderBase_EMessage();
-
-  /**
-   * Returns the meta object for the reference '{@link org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase#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.soap.SOAPHeaderBase#getEPart()
-   * @see #getSOAPHeaderBase()
-   * @generated
-   */
-  EReference getSOAPHeaderBase_EPart();
-
-  /**
-   * 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 <em>EEncoding Styles</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>EEncoding Styles</em>'.
-   * @see org.eclipse.wst.wsdl.binding.soap.SOAPFault
-   * @see #getSOAPFault()
-   * @generated
-   */
-  EAttribute getSOAPFault_EEncodingStyles();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.wst.wsdl.binding.soap.SOAPFault#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.binding.soap.SOAPFault#getName()
-   * @see #getSOAPFault()
-   * @generated
-   */
-  EAttribute getSOAPFault_Name();
-
-  /**
-   * 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 class '{@link javax.wsdl.extensions.soap.SOAPBinding <em>ISOAP Binding</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Binding</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPBinding
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPBinding"
-   * @generated
-   */
-  EClass getISOAPBinding();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPAddress <em>ISOAP Address</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Address</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPAddress
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPAddress"
-   * @generated
-   */
-  EClass getISOAPAddress();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPBody <em>ISOAP Body</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Body</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPBody
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPBody"
-   * @generated
-   */
-  EClass getISOAPBody();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPFault <em>ISOAP Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Fault</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPFault
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPFault"
-   * @generated
-   */
-  EClass getISOAPFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPOperation <em>ISOAP Operation</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Operation</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPOperation
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPOperation"
-   * @generated
-   */
-  EClass getISOAPOperation();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPHeaderFault <em>ISOAP Header Fault</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Header Fault</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPHeaderFault
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPHeaderFault"
-   * @generated
-   */
-  EClass getISOAPHeaderFault();
-
-  /**
-   * Returns the meta object for class '{@link javax.wsdl.extensions.soap.SOAPHeader <em>ISOAP Header</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>ISOAP Header</em>'.
-   * @see javax.wsdl.extensions.soap.SOAPHeader
-   * @model instanceClass="javax.wsdl.extensions.soap.SOAPHeader"
-   * @generated
-   */
-  EClass getISOAPHeader();
-
-  /**
-   * 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();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_BINDING = eINSTANCE.getSOAPBinding();
-
-    /**
-     * The meta object literal for the '<em><b>Transport URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_BINDING__TRANSPORT_URI = eINSTANCE.getSOAPBinding_TransportURI();
-
-    /**
-     * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_BINDING__STYLE = eINSTANCE.getSOAPBinding_Style();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_BODY = eINSTANCE.getSOAPBody();
-
-    /**
-     * The meta object literal for the '<em><b>Use</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_BODY__USE = eINSTANCE.getSOAPBody_Use();
-
-    /**
-     * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_BODY__NAMESPACE_URI = eINSTANCE.getSOAPBody_NamespaceURI();
-
-    /**
-     * The meta object literal for the '<em><b>EEncoding Styles</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_BODY__EENCODING_STYLES = eINSTANCE.getSOAPBody_EEncodingStyles();
-
-    /**
-     * The meta object literal for the '<em><b>EParts</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SOAP_BODY__EPARTS = eINSTANCE.getSOAPBody_EParts();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_HEADER_BASE = eINSTANCE.getSOAPHeaderBase();
-
-    /**
-     * The meta object literal for the '<em><b>Use</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_HEADER_BASE__USE = eINSTANCE.getSOAPHeaderBase_Use();
-
-    /**
-     * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_HEADER_BASE__NAMESPACE_URI = eINSTANCE.getSOAPHeaderBase_NamespaceURI();
-
-    /**
-     * The meta object literal for the '<em><b>EEncoding Styles</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_HEADER_BASE__EENCODING_STYLES = eINSTANCE.getSOAPHeaderBase_EEncodingStyles();
-
-    /**
-     * The meta object literal for the '<em><b>Message</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_HEADER_BASE__MESSAGE = eINSTANCE.getSOAPHeaderBase_Message();
-
-    /**
-     * The meta object literal for the '<em><b>Part</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_HEADER_BASE__PART = eINSTANCE.getSOAPHeaderBase_Part();
-
-    /**
-     * The meta object literal for the '<em><b>EMessage</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SOAP_HEADER_BASE__EMESSAGE = eINSTANCE.getSOAPHeaderBase_EMessage();
-
-    /**
-     * The meta object literal for the '<em><b>EPart</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SOAP_HEADER_BASE__EPART = eINSTANCE.getSOAPHeaderBase_EPart();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_FAULT = eINSTANCE.getSOAPFault();
-
-    /**
-     * The meta object literal for the '<em><b>Use</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_FAULT__USE = eINSTANCE.getSOAPFault_Use();
-
-    /**
-     * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_FAULT__NAMESPACE_URI = eINSTANCE.getSOAPFault_NamespaceURI();
-
-    /**
-     * The meta object literal for the '<em><b>EEncoding Styles</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_FAULT__EENCODING_STYLES = eINSTANCE.getSOAPFault_EEncodingStyles();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_FAULT__NAME = eINSTANCE.getSOAPFault_Name();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_OPERATION = eINSTANCE.getSOAPOperation();
-
-    /**
-     * The meta object literal for the '<em><b>Soap Action URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_OPERATION__SOAP_ACTION_URI = eINSTANCE.getSOAPOperation_SoapActionURI();
-
-    /**
-     * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_OPERATION__STYLE = eINSTANCE.getSOAPOperation_Style();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_ADDRESS = eINSTANCE.getSOAPAddress();
-
-    /**
-     * The meta object literal for the '<em><b>Location URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SOAP_ADDRESS__LOCATION_URI = eINSTANCE.getSOAPAddress_LocationURI();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_HEADER_FAULT = eINSTANCE.getSOAPHeaderFault();
-
-    /**
-     * The meta object literal 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
-     */
-    EClass SOAP_HEADER = eINSTANCE.getSOAPHeader();
-
-    /**
-     * The meta object literal for the '<em><b>Header Faults</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SOAP_HEADER__HEADER_FAULTS = eINSTANCE.getSOAPHeader_HeaderFaults();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPBinding <em>ISOAP Binding</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPBinding
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPBinding()
-     * @generated
-     */
-    EClass ISOAP_BINDING = eINSTANCE.getISOAPBinding();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPAddress <em>ISOAP Address</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPAddress
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPAddress()
-     * @generated
-     */
-    EClass ISOAP_ADDRESS = eINSTANCE.getISOAPAddress();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPBody <em>ISOAP Body</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPBody
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPBody()
-     * @generated
-     */
-    EClass ISOAP_BODY = eINSTANCE.getISOAPBody();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPFault <em>ISOAP Fault</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPFault
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPFault()
-     * @generated
-     */
-    EClass ISOAP_FAULT = eINSTANCE.getISOAPFault();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPOperation <em>ISOAP Operation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPOperation
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPOperation()
-     * @generated
-     */
-    EClass ISOAP_OPERATION = eINSTANCE.getISOAPOperation();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPHeaderFault <em>ISOAP Header Fault</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPHeaderFault
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPHeaderFault()
-     * @generated
-     */
-    EClass ISOAP_HEADER_FAULT = eINSTANCE.getISOAPHeaderFault();
-
-    /**
-     * The meta object literal for the '{@link javax.wsdl.extensions.soap.SOAPHeader <em>ISOAP Header</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.extensions.soap.SOAPHeader
-     * @see org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPPackageImpl#getISOAPHeader()
-     * @generated
-     */
-    EClass ISOAP_HEADER = eINSTANCE.getISOAPHeader();
-
-    /**
-     * The meta object literal 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
-     */
-    EDataType ISTRING = eINSTANCE.getIString();
-
-  }
-
-} //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 6191903..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/generator/SOAPContentGenerator.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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";
-  }
-}
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 017a1ed..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPAddressImpl.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.Literals.SOAP_ADDRESS;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-      return getLocationURI();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-      setLocationURI((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-      setLocationURI(LOCATION_URI_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_ADDRESS__LOCATION_URI:
-      return LOCATION_URI_EDEFAULT == null ? locationURI != null : !LOCATION_URI_EDEFAULT.equals(locationURI);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: "); //$NON-NLS-1$
-    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.Literals.SOAP_ADDRESS__LOCATION_URI)
-        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 d48a4ec..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBindingImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.Literals.SOAP_BINDING;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-      return getTransportURI();
-      case SOAPPackage.SOAP_BINDING__STYLE:
-      return getStyle();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-      setTransportURI((String)newValue);
-      return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-      setStyle((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BINDING__TRANSPORT_URI:
-      setTransportURI(TRANSPORT_URI_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_BINDING__STYLE:
-      setStyle(STYLE_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (transportURI: "); //$NON-NLS-1$
-    result.append(transportURI);
-    result.append(", style: "); //$NON-NLS-1$
-    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.Literals.SOAP_BINDING__STYLE)
-        niceSetAttribute(theElement, SOAPConstants.STYLE_ATTRIBUTE, getStyle());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_BINDING__TRANSPORT_URI)
-        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 c0cc4fe..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPBodyImpl.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EReference;
-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;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * <!-- 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#getEEncodingStyles <em>EEncoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl#getEParts <em>EParts</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 #getEEncodingStyles() <em>EEncoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEEncodingStyles()
-   * @generated
-   * @ordered
-   */
-  protected EList eEncodingStyles = null;
-
-  /**
-   * The cached value of the '{@link #getEParts() <em>EParts</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEParts()
-   * @generated
-   * @ordered
-   */
-  protected EList eParts = 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.Literals.SOAP_BODY;
-  }
-
-  /**
-   * <!-- 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));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEEncodingStyles()
-  {
-    if (eEncodingStyles == null)
-    {
-      eEncodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_BODY__EENCODING_STYLES);
-    }
-    return eEncodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEParts()
-  {
-    if (eParts == null)
-    {
-      eParts = new EObjectResolvingEList(Part.class, this, SOAPPackage.SOAP_BODY__EPARTS);
-    }
-    return eParts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setEncodingStyles(List list)
-  {
-    eEncodingStyles = (EList)list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getEncodingStyles()
-  {
-    return getEEncodingStyles();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  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__EPARTS);
-      return getImplicitParts();
-    }
-
-    if (parts.size() == 0)
-    {
-      return getImplicitParts();
-    }
-
-    return parts;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BODY__USE:
-      return getUse();
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-      return getNamespaceURI();
-      case SOAPPackage.SOAP_BODY__EENCODING_STYLES:
-      return getEEncodingStyles();
-      case SOAPPackage.SOAP_BODY__EPARTS:
-      return getEParts();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BODY__USE:
-      setUse((String)newValue);
-      return;
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-      setNamespaceURI((String)newValue);
-      return;
-      case SOAPPackage.SOAP_BODY__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      getEEncodingStyles().addAll((Collection)newValue);
-      return;
-      case SOAPPackage.SOAP_BODY__EPARTS:
-      getEParts().clear();
-      getEParts().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_BODY__USE:
-      setUse(USE_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_BODY__NAMESPACE_URI:
-      setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_BODY__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      return;
-      case SOAPPackage.SOAP_BODY__EPARTS:
-      getEParts().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EENCODING_STYLES:
-      return eEncodingStyles != null && !eEncodingStyles.isEmpty();
-      case SOAPPackage.SOAP_BODY__EPARTS:
-      return eParts != null && !eParts.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: "); //$NON-NLS-1$
-    result.append(use);
-    result.append(", namespaceURI: "); //$NON-NLS-1$
-    result.append(namespaceURI);
-    result.append(", eEncodingStyles: "); //$NON-NLS-1$
-    result.append(eEncodingStyles);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setUse(SOAPConstants.getAttribute(changedElement, SOAPConstants.USE_ATTRIBUTE));
-    setNamespaceURI(SOAPConstants.getAttribute(changedElement, 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());
-    }
-    else
-    {
-      getEncodingStyles().clear();
-    }
-
-    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.Literals.SOAP_BODY__USE)
-        niceSetAttribute(theElement, SOAPConstants.USE_ATTRIBUTE, getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_BODY__NAMESPACE_URI)
-        niceSetAttribute(theElement, SOAPConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_BODY__EENCODING_STYLES)
-      {
-        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.Literals.SOAP_BODY__EPARTS)
-      {
-        // Used to be Bugzilla 108176, now it is Bugzilla 137990
-
-        String partsAttributeValue = null;
-
-        // Do not use getParts() as it will return the list of implicit message
-        // parts.
-
-        if (parts != null && !parts.isEmpty())
-        {
-          StringBuffer partNamesBuffer = new StringBuffer();
-          Iterator iterator = parts.iterator();
-
-          while (iterator.hasNext())
-          {
-            Part part = (Part)iterator.next();
-            String partName = part.getName();
-
-            partNamesBuffer.append(partName);
-
-            if (iterator.hasNext())
-            {
-              partNamesBuffer.append(" "); //$NON-NLS-1$
-            }
-          }
-
-          partsAttributeValue = partNamesBuffer.toString();
-        }
-
-        niceSetAttribute(theElement, SOAPConstants.PARTS_ATTRIBUTE, partsAttributeValue);
-      }
-    }
-  }
-
-  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 d9a2e9c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFactoryImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.binding.soap.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPFactoryImpl extends EFactoryImpl implements SOAPFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static SOAPFactory init()
-  {
-    try
-    {
-      SOAPFactory theSOAPFactory = (SOAPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/SOAP"); //$NON-NLS-1$ 
-      if (theSOAPFactory != null)
-      {
-        return theSOAPFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new SOAPFactoryImpl();
-  }
-
-  /**
-   * Creates an 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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 77041e4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPFaultImpl.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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#getEEncodingStyles <em>EEncoding Styles</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPFaultImpl#getName <em>Name</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 #getEEncodingStyles() <em>EEncoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEEncodingStyles()
-   * @generated
-   * @ordered
-   */
-  protected EList eEncodingStyles = null;
-
-  /**
-   * 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 SOAPFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SOAPPackage.Literals.SOAP_FAULT;
-  }
-
-  /**
-   * <!-- 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));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EList getEEncodingStyles()
-  {
-    if (eEncodingStyles == null)
-    {
-      eEncodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_FAULT__EENCODING_STYLES);
-    }
-    return eEncodingStyles;
-  }
-
-  /**
-   * <!-- 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, SOAPPackage.SOAP_FAULT__NAME, oldName, name));
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see javax.wsdl.extensions.soap.SOAPFault#getEncodingStyles()
-   */
-  public List getEncodingStyles()
-  {
-    return getEEncodingStyles();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_FAULT__USE:
-      return getUse();
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-      return getNamespaceURI();
-      case SOAPPackage.SOAP_FAULT__EENCODING_STYLES:
-      return getEEncodingStyles();
-      case SOAPPackage.SOAP_FAULT__NAME:
-      return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_FAULT__USE:
-      setUse((String)newValue);
-      return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-      setNamespaceURI((String)newValue);
-      return;
-      case SOAPPackage.SOAP_FAULT__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      getEEncodingStyles().addAll((Collection)newValue);
-      return;
-      case SOAPPackage.SOAP_FAULT__NAME:
-      setName((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_FAULT__USE:
-      setUse(USE_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_FAULT__NAMESPACE_URI:
-      setNamespaceURI(NAMESPACE_URI_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_FAULT__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      return;
-      case SOAPPackage.SOAP_FAULT__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EENCODING_STYLES:
-      return eEncodingStyles != null && !eEncodingStyles.isEmpty();
-      case SOAPPackage.SOAP_FAULT__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  public void setEncodingStyles(List list)
-  {
-    eEncodingStyles = (EList)list;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: "); //$NON-NLS-1$
-    result.append(use);
-    result.append(", namespaceURI: "); //$NON-NLS-1$
-    result.append(namespaceURI);
-    result.append(", eEncodingStyles: "); //$NON-NLS-1$
-    result.append(eEncodingStyles);
-    result.append(", name: "); //$NON-NLS-1$
-    result.append(name);
-    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_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.Literals.SOAP_FAULT__NAMESPACE_URI)
-        niceSetAttribute(theElement, SOAPConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_FAULT__USE)
-        niceSetAttribute(theElement, SOAPConstants.USE_ATTRIBUTE, getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_FAULT__EENCODING_STYLES)
-      {
-        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 (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_FAULT__NAME)
-        niceSetAttribute(theElement, SOAPConstants.NAME_ATTRIBUTE, getName());
-    }
-  }
-
-  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 7fcd240..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderBaseImpl.java
+++ /dev/null
@@ -1,681 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EReference;
-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;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * <!-- 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#getEEncodingStyles <em>EEncoding 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>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getEMessage <em>EMessage</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPHeaderBaseImpl#getEPart <em>EPart</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 #getEEncodingStyles() <em>EEncoding Styles</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEEncodingStyles()
-   * @generated
-   * @ordered
-   */
-  protected EList eEncodingStyles = null;
-
-  /**
-   * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMessage()
-   * @generated
-   * @ordered
-   */
-  protected static final QName MESSAGE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMessage()
-   * @generated
-   * @ordered
-   */
-  protected QName message = MESSAGE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPart() <em>Part</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPart()
-   * @generated
-   * @ordered
-   */
-  protected static final String PART_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPart() <em>Part</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPart()
-   * @generated
-   * @ordered
-   */
-  protected String part = PART_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;
-
-  /**
-   * 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;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SOAPHeaderBaseImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SOAPPackage.Literals.SOAP_HEADER_BASE;
-  }
-
-  /**
-   * <!-- 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 getEEncodingStyles()
-  {
-    if (eEncodingStyles == null)
-    {
-      eEncodingStyles = new EDataTypeUniqueEList(String.class, this, SOAPPackage.SOAP_HEADER_BASE__EENCODING_STYLES);
-    }
-    return eEncodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Message getEMessage()
-  {
-    if (eMessage != null && eMessage.eIsProxy())
-    {
-      InternalEObject oldEMessage = (InternalEObject)eMessage;
-      eMessage = (Message)eResolveProxy(oldEMessage);
-      if (eMessage != oldEMessage)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__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, SOAPPackage.SOAP_HEADER_BASE__EMESSAGE, oldEMessage, eMessage));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Part getEPart()
-  {
-    if (ePart != null && ePart.eIsProxy())
-    {
-      InternalEObject oldEPart = (InternalEObject)ePart;
-      ePart = (Part)eResolveProxy(oldEPart);
-      if (ePart != oldEPart)
-      {
-        if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SOAPPackage.SOAP_HEADER_BASE__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, SOAPPackage.SOAP_HEADER_BASE__EPART, oldEPart, ePart));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public QName getMessage()
-  {
-    return message;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setMessage(QName newMessage)
-  {
-    QName 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 String getPart()
-  {
-    return part;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPart(String newPart)
-  {
-    String 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 NOT
-   */
-  public List getEncodingStyles()
-  {
-    return getEEncodingStyles();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setEncodingStyles(List encodingStyles)
-  {
-    eEncodingStyles = (EList)encodingStyles;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER_BASE__USE:
-      return getUse();
-      case SOAPPackage.SOAP_HEADER_BASE__NAMESPACE_URI:
-      return getNamespaceURI();
-      case SOAPPackage.SOAP_HEADER_BASE__EENCODING_STYLES:
-      return getEEncodingStyles();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-      return getMessage();
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-      return getPart();
-      case SOAPPackage.SOAP_HEADER_BASE__EMESSAGE:
-      if (resolve)
-        return getEMessage();
-      return basicGetEMessage();
-      case SOAPPackage.SOAP_HEADER_BASE__EPART:
-      if (resolve)
-        return getEPart();
-      return basicGetEPart();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      getEEncodingStyles().addAll((Collection)newValue);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-      setMessage((QName)newValue);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-      setPart((String)newValue);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__EMESSAGE:
-      setEMessage((Message)newValue);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__EPART:
-      setEPart((Part)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EENCODING_STYLES:
-      getEEncodingStyles().clear();
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-      setMessage(MESSAGE_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-      setPart(PART_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__EMESSAGE:
-      setEMessage((Message)null);
-      return;
-      case SOAPPackage.SOAP_HEADER_BASE__EPART:
-      setEPart((Part)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EENCODING_STYLES:
-      return eEncodingStyles != null && !eEncodingStyles.isEmpty();
-      case SOAPPackage.SOAP_HEADER_BASE__MESSAGE:
-      return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-      case SOAPPackage.SOAP_HEADER_BASE__PART:
-      return PART_EDEFAULT == null ? part != null : !PART_EDEFAULT.equals(part);
-      case SOAPPackage.SOAP_HEADER_BASE__EMESSAGE:
-      return eMessage != null;
-      case SOAPPackage.SOAP_HEADER_BASE__EPART:
-      return ePart != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: "); //$NON-NLS-1$
-    result.append(use);
-    result.append(", namespaceURI: "); //$NON-NLS-1$
-    result.append(namespaceURI);
-    result.append(", eEncodingStyles: "); //$NON-NLS-1$
-    result.append(eEncodingStyles);
-    result.append(", message: "); //$NON-NLS-1$
-    result.append(message);
-    result.append(", part: "); //$NON-NLS-1$
-    result.append(part);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods: DOM -> Model
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setUse(SOAPConstants.getAttribute(changedElement, SOAPConstants.USE_ATTRIBUTE));
-    setNamespaceURI(SOAPConstants.getAttribute(changedElement, SOAPConstants.NAMESPACE_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.MESSAGE_ATTRIBUTE))
-    {
-      Definition definition = (Definition)getEnclosingDefinition();
-      QName messageQName = createQName(definition, changedElement.getAttribute(SOAPConstants.MESSAGE_ATTRIBUTE), changedElement);
-      setMessage(messageQName);
-    }
-    else
-    {
-      setMessage(null);
-    }
-    setPart(SOAPConstants.getAttribute(changedElement, SOAPConstants.PART_ATTRIBUTE));
-    if (changedElement.hasAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE))
-    {
-      String encodingStyles = changedElement.getAttribute(SOAPConstants.ENCODING_STYLE_ATTRIBUTE);
-      StringTokenizer tokenizer = new StringTokenizer(encodingStyles);
-      while (tokenizer.hasMoreTokens())
-        getEEncodingStyles().add(tokenizer.nextToken());
-    }
-    else
-    {
-      getEEncodingStyles().clear();
-    }
-
-    reconcileReferences(false);
-  }
-
-  public void reconcileReferences(boolean deep)
-  {
-    if (element != null)
-    {
-      Definition definition = (Definition)getEnclosingDefinition();
-      Message message = (this.message != null) ? (Message)definition.getMessage(this.message) : null;
-      if (message != null && message != getEMessage())
-      {
-        setEMessage(message);
-
-        Part newPart = (Part)message.getPart(part);
-        if (newPart != null && newPart != getEPart())
-        {
-          setEPart(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.Literals.SOAP_HEADER_BASE__USE)
-        niceSetAttribute(theElement, SOAPConstants.USE_ATTRIBUTE, getUse());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_HEADER_BASE__NAMESPACE_URI)
-        niceSetAttribute(theElement, SOAPConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_HEADER_BASE__PART)
-        niceSetAttribute(theElement, SOAPConstants.PART_ATTRIBUTE, getPart());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_HEADER_BASE__MESSAGE)
-      {
-        String uriList = message != null ? message.getNamespaceURI() + "#" + message.getLocalPart() : null;
-        niceSetAttributeURIValue(theElement, SOAPConstants.MESSAGE_ATTRIBUTE, uriList);
-      }
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_HEADER_BASE__EENCODING_STYLES)
-      {
-        List encodingStyleList = getEEncodingStyles();
-        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.Literals.SOAP_HEADER_BASE__EMESSAGE)
-      {
-        Message message = getEMessage();
-        if (message != null)
-        {
-          QName qName = message.getQName();
-          niceSetAttributeURIValue(theElement, SOAPConstants.MESSAGE_ATTRIBUTE, qName.getNamespaceURI() + "#" + qName.getLocalPart());
-        }
-      }
-
-      if (eReference == null || eReference == SOAPPackage.Literals.SOAP_HEADER_BASE__EPART)
-      {
-        Part part = getEPart();
-        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 7b44830..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderFaultImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EClass;
-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;
-
-
-/**
- * <!-- 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
-{
-  /**
-   * 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 SOAPHeaderFaultImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SOAPPackage.Literals.SOAP_HEADER_FAULT;
-  }
-
-  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 1e995ff..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPHeaderImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-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.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
-{
-  /**
-   * 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 #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.Literals.SOAP_HEADER;
-  }
-
-  /**
-   * <!-- 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 NOT
-   */
-  public List getSOAPHeaderFaults()
-  {
-    return getHeaderFaults();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void addSOAPHeaderFault(javax.wsdl.extensions.soap.SOAPHeaderFault soapHeaderFault)
-  {
-    EList headerFaults = getHeaderFaults();
-    headerFaults.add(soapHeaderFault);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-      return ((InternalEList)getHeaderFaults()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-      return getHeaderFaults();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-      getHeaderFaults().clear();
-      getHeaderFaults().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-      getHeaderFaults().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_HEADER__HEADER_FAULTS:
-      return headerFaults != null && !headerFaults.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  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 b87e3f8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPOperationImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.Literals.SOAP_OPERATION;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-      return getSoapActionURI();
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-      return getStyle();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-      setSoapActionURI((String)newValue);
-      return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-      setStyle((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SOAPPackage.SOAP_OPERATION__SOAP_ACTION_URI:
-      setSoapActionURI(SOAP_ACTION_URI_EDEFAULT);
-      return;
-      case SOAPPackage.SOAP_OPERATION__STYLE:
-      setStyle(STYLE_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (soapActionURI: "); //$NON-NLS-1$
-    result.append(soapActionURI);
-    result.append(", style: "); //$NON-NLS-1$
-    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.Literals.SOAP_OPERATION__SOAP_ACTION_URI)
-        niceSetAttribute(theElement, SOAPConstants.SOAP_ACTION_ATTRIBUTE, getSoapActionURI());
-      if (eAttribute == null || eAttribute == SOAPPackage.Literals.SOAP_OPERATION__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 3f6fb52..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.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.xsd.XSDPackage;
-
-
-/**
- * <!-- 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 EClass isoapBindingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapAddressEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapBodyEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapOperationEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapHeaderFaultEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass isoapHeaderEClass = 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.getEPackage(SOAPPackage.eNS_URI);
-
-    // Obtain or create and register package
-    SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SOAPPackageImpl
-      ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SOAPPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    WSDLPackage.eINSTANCE.eClass();
-    XSDPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theSOAPPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theSOAPPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theSOAPPackage.freeze();
-
-    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_EEncodingStyles()
-  {
-    return (EAttribute)soapBodyEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSOAPBody_EParts()
-  {
-    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_EEncodingStyles()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSOAPHeaderBase_Message()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSOAPHeaderBase_Part()
-  {
-    return (EAttribute)soapHeaderBaseEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSOAPHeaderBase_EMessage()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(5);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getSOAPHeaderBase_EPart()
-  {
-    return (EReference)soapHeaderBaseEClass.getEStructuralFeatures().get(6);
-  }
-
-  /**
-   * <!-- 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_EEncodingStyles()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getSOAPFault_Name()
-  {
-    return (EAttribute)soapFaultEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- 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 EClass getISOAPBinding()
-  {
-    return isoapBindingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPAddress()
-  {
-    return isoapAddressEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPBody()
-  {
-    return isoapBodyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPFault()
-  {
-    return isoapFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPOperation()
-  {
-    return isoapOperationEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPHeaderFault()
-  {
-    return isoapHeaderFaultEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getISOAPHeader()
-  {
-    return isoapHeaderEClass;
-  }
-
-  /**
-   * <!-- 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__EENCODING_STYLES);
-    createEReference(soapBodyEClass, SOAP_BODY__EPARTS);
-
-    soapHeaderBaseEClass = createEClass(SOAP_HEADER_BASE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__USE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__NAMESPACE_URI);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__EENCODING_STYLES);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__MESSAGE);
-    createEAttribute(soapHeaderBaseEClass, SOAP_HEADER_BASE__PART);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__EMESSAGE);
-    createEReference(soapHeaderBaseEClass, SOAP_HEADER_BASE__EPART);
-
-    soapFaultEClass = createEClass(SOAP_FAULT);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__USE);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__NAMESPACE_URI);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__EENCODING_STYLES);
-    createEAttribute(soapFaultEClass, SOAP_FAULT__NAME);
-
-    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);
-
-    isoapBindingEClass = createEClass(ISOAP_BINDING);
-
-    isoapAddressEClass = createEClass(ISOAP_ADDRESS);
-
-    isoapBodyEClass = createEClass(ISOAP_BODY);
-
-    isoapFaultEClass = createEClass(ISOAP_FAULT);
-
-    isoapOperationEClass = createEClass(ISOAP_OPERATION);
-
-    isoapHeaderFaultEClass = createEClass(ISOAP_HEADER_FAULT);
-
-    isoapHeaderEClass = createEClass(ISOAP_HEADER);
-
-    // 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
-    WSDLPackage theWSDLPackage = (WSDLPackage)EPackage.Registry.INSTANCE.getEPackage(WSDLPackage.eNS_URI);
-
-    // Add supertypes to classes
-    soapBindingEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapBindingEClass.getESuperTypes().add(this.getISOAPBinding());
-    soapBodyEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapBodyEClass.getESuperTypes().add(this.getISOAPBody());
-    soapHeaderBaseEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapFaultEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapFaultEClass.getESuperTypes().add(this.getISOAPFault());
-    soapOperationEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapOperationEClass.getESuperTypes().add(this.getISOAPOperation());
-    soapAddressEClass.getESuperTypes().add(theWSDLPackage.getExtensibilityElement());
-    soapAddressEClass.getESuperTypes().add(this.getISOAPAddress());
-    soapHeaderFaultEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-    soapHeaderFaultEClass.getESuperTypes().add(this.getISOAPHeaderFault());
-    soapHeaderEClass.getESuperTypes().add(this.getSOAPHeaderBase());
-    soapHeaderEClass.getESuperTypes().add(this.getISOAPHeader());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(soapBindingEClass, SOAPBinding.class, "SOAPBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPBinding_TransportURI(),
-      ecorePackage.getEString(),
-      "transportURI", null, 0, 1, SOAPBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPBinding_Style(),
-      ecorePackage.getEString(),
-      "style", null, 0, 1, SOAPBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(soapBodyEClass, SOAPBody.class, "SOAPBody", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPBody_Use(),
-      ecorePackage.getEString(),
-      "use", null, 0, 1, SOAPBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPBody_NamespaceURI(),
-      ecorePackage.getEString(),
-      "namespaceURI", null, 0, 1, SOAPBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPBody_EEncodingStyles(),
-      this.getIString(),
-      "eEncodingStyles", null, 0, -1, SOAPBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-      getSOAPBody_EParts(),
-      theWSDLPackage.getPart(),
-      null,
-      "eParts", null, 0, -1, SOAPBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(soapHeaderBaseEClass, SOAPHeaderBase.class, "SOAPHeaderBase", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPHeaderBase_Use(),
-      ecorePackage.getEString(),
-      "use", null, 0, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPHeaderBase_NamespaceURI(),
-      ecorePackage.getEString(),
-      "namespaceURI", null, 0, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPHeaderBase_EEncodingStyles(),
-      this.getIString(),
-      "eEncodingStyles", null, 0, -1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPHeaderBase_Message(),
-      theWSDLPackage.getQName(),
-      "message", null, 0, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPHeaderBase_Part(),
-      ecorePackage.getEString(),
-      "part", null, 0, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-      getSOAPHeaderBase_EMessage(),
-      theWSDLPackage.getMessage(),
-      null,
-      "eMessage", null, 1, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEReference(
-      getSOAPHeaderBase_EPart(),
-      theWSDLPackage.getPart(),
-      null,
-      "ePart", null, 1, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    EOperation op = addEOperation(soapHeaderBaseEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(soapHeaderBaseEClass, null, "setEncodingStyles"); //$NON-NLS-1$
-    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1); //$NON-NLS-1$
-
-    initEClass(soapFaultEClass, SOAPFault.class, "SOAPFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPFault_Use(),
-      ecorePackage.getEString(),
-      "use", null, 0, 1, SOAPFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPFault_NamespaceURI(),
-      ecorePackage.getEString(),
-      "namespaceURI", null, 0, 1, SOAPFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPFault_EEncodingStyles(),
-      this.getIString(),
-      "eEncodingStyles", null, 0, -1, SOAPFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPFault_Name(),
-      ecorePackage.getEString(),
-      "name", null, 0, 1, SOAPFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(soapOperationEClass, SOAPOperation.class, "SOAPOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPOperation_SoapActionURI(),
-      ecorePackage.getEString(),
-      "soapActionURI", null, 0, 1, SOAPOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPOperation_Style(),
-      ecorePackage.getEString(),
-      "style", null, 0, 1, SOAPOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(soapAddressEClass, SOAPAddress.class, "SOAPAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEAttribute(
-      getSOAPAddress_LocationURI(),
-      ecorePackage.getEString(),
-      "locationURI", null, 0, 1, SOAPAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(soapHeaderFaultEClass, SOAPHeaderFault.class, "SOAPHeaderFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(soapHeaderEClass, SOAPHeader.class, "SOAPHeader", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEReference(
-      getSOAPHeader_HeaderFaults(),
-      this.getSOAPHeaderFault(),
-      null,
-      "headerFaults", null, 0, -1, SOAPHeader.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-    initEClass(
-      isoapBindingEClass,
-      javax.wsdl.extensions.soap.SOAPBinding.class,
-      "ISOAPBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      isoapAddressEClass,
-      javax.wsdl.extensions.soap.SOAPAddress.class,
-      "ISOAPAddress", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      isoapBodyEClass,
-      javax.wsdl.extensions.soap.SOAPBody.class,
-      "ISOAPBody", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(isoapBodyEClass, null, "setEncodingStyles"); //$NON-NLS-1$
-    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getParts", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(isoapBodyEClass, null, "setParts"); //$NON-NLS-1$
-    addEParameter(op, theWSDLPackage.getIList(), "parts", 0, 1); //$NON-NLS-1$
-
-    initEClass(
-      isoapFaultEClass,
-      javax.wsdl.extensions.soap.SOAPFault.class,
-      "ISOAPFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      isoapOperationEClass,
-      javax.wsdl.extensions.soap.SOAPOperation.class,
-      "ISOAPOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      isoapHeaderFaultEClass,
-      javax.wsdl.extensions.soap.SOAPHeaderFault.class,
-      "ISOAPHeaderFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      isoapHeaderEClass,
-      javax.wsdl.extensions.soap.SOAPHeader.class,
-      "ISOAPHeader", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(isoapHeaderEClass, theWSDLPackage.getIList(), "getSOAPHeaderFaults", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(isoapHeaderEClass, null, "addSOAPHeaderFault"); //$NON-NLS-1$
-    addEParameter(op, this.getISOAPHeaderFault(), "soapHeaderFault", 0, 1); //$NON-NLS-1$
-
-    // Initialize data types
-    initEDataType(iStringEDataType, String.class, "IString", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    // 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 55ab860..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPAdapterFactory.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-
-/**
- * <!-- 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 caseISOAPBinding(javax.wsdl.extensions.soap.SOAPBinding object)
-      {
-        return createISOAPBindingAdapter();
-      }
-
-      public Object caseISOAPAddress(javax.wsdl.extensions.soap.SOAPAddress object)
-      {
-        return createISOAPAddressAdapter();
-      }
-
-      public Object caseISOAPBody(javax.wsdl.extensions.soap.SOAPBody object)
-      {
-        return createISOAPBodyAdapter();
-      }
-
-      public Object caseISOAPFault(javax.wsdl.extensions.soap.SOAPFault object)
-      {
-        return createISOAPFaultAdapter();
-      }
-
-      public Object caseISOAPOperation(javax.wsdl.extensions.soap.SOAPOperation object)
-      {
-        return createISOAPOperationAdapter();
-      }
-
-      public Object caseISOAPHeaderFault(javax.wsdl.extensions.soap.SOAPHeaderFault object)
-      {
-        return createISOAPHeaderFaultAdapter();
-      }
-
-      public Object caseISOAPHeader(javax.wsdl.extensions.soap.SOAPHeader object)
-      {
-        return createISOAPHeaderAdapter();
-      }
-
-      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 javax.wsdl.extensions.soap.SOAPBinding <em>ISOAP 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.soap.SOAPBinding
-   * @generated
-   */
-  public Adapter createISOAPBindingAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPAddress <em>ISOAP 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.soap.SOAPAddress
-   * @generated
-   */
-  public Adapter createISOAPAddressAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPBody <em>ISOAP 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 javax.wsdl.extensions.soap.SOAPBody
-   * @generated
-   */
-  public Adapter createISOAPBodyAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPFault <em>ISOAP 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.extensions.soap.SOAPFault
-   * @generated
-   */
-  public Adapter createISOAPFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPOperation <em>ISOAP 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.soap.SOAPOperation
-   * @generated
-   */
-  public Adapter createISOAPOperationAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPHeaderFault <em>ISOAP 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 javax.wsdl.extensions.soap.SOAPHeaderFault
-   * @generated
-   */
-  public Adapter createISOAPHeaderFaultAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link javax.wsdl.extensions.soap.SOAPHeader <em>ISOAP 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 javax.wsdl.extensions.soap.SOAPHeader
-   * @generated
-   */
-  public Adapter createISOAPHeaderAdapter()
-  {
-    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 766aa59..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPConstants.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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"; //$NON-NLS-1$
-
-  public static final String BINDING_ELEMENT_TAG = "binding"; //$NON-NLS-1$
-
-  public static final String BODY_ELEMENT_TAG = "body"; //$NON-NLS-1$
-
-  public static final String FAULT_ELEMENT_TAG = "fault"; //$NON-NLS-1$
-
-  public static final String HEADER_ELEMENT_TAG = "header"; //$NON-NLS-1$
-
-  public static final String HEADER_FAULT_ELEMENT_TAG = "headerfault"; //$NON-NLS-1$
-
-  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
-
-  public static final String SOAP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/soap/"; //$NON-NLS-1$
-
-  public static final String SOAP_ACTION_ATTRIBUTE = "soapAction"; //$NON-NLS-1$
-
-  public static final String STYLE_ATTRIBUTE = "style"; //$NON-NLS-1$
-
-  public static final String LOCATION_ATTRIBUTE = "location"; //$NON-NLS-1$
-
-  public static final String TRANSPORT_ATTRIBUTE = "transport"; //$NON-NLS-1$
-
-  public static final String USE_ATTRIBUTE = "use"; //$NON-NLS-1$
-
-  public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
-
-  public static final String NAMESPACE_URI_ATTRIBUTE = "namespaceURI"; //$NON-NLS-1$
-
-  public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
-  public static final String ENCODING_STYLE_ATTRIBUTE = "encodingStyle"; //$NON-NLS-1$
-
-  public static final String MESSAGE_ATTRIBUTE = "message"; //$NON-NLS-1$
-
-  public static final String PART_ATTRIBUTE = "part"; //$NON-NLS-1$
-
-  public static final String PARTS_ATTRIBUTE = "parts"; //$NON-NLS-1$
-
-  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 8142b04..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPExtensibilityElementFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 6548744..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/util/SOAPSwitch.java
+++ /dev/null
@@ -1,543 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 java.util.List;
-
-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.*;
-
-
-/**
- * <!-- 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)
-  {
-    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 SOAPPackage.SOAP_BINDING:
-      {
-        SOAPBinding soapBinding = (SOAPBinding)theEObject;
-        Object result = caseSOAPBinding(soapBinding);
-        if (result == null)
-          result = caseExtensibilityElement(soapBinding);
-        if (result == null)
-          result = caseISOAPBinding(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 = caseISOAPBody(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 = caseISOAPFault(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 = caseISOAPOperation(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 = caseISOAPAddress(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 = caseISOAPHeaderFault(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 = caseISOAPHeader(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);
-    }
-  }
-
-  /**
-   * 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>ISOAP 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>ISOAP Binding</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPBinding(javax.wsdl.extensions.soap.SOAPBinding object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Address</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPAddress(javax.wsdl.extensions.soap.SOAPAddress object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Body</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPBody(javax.wsdl.extensions.soap.SOAPBody object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPFault(javax.wsdl.extensions.soap.SOAPFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Operation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPOperation(javax.wsdl.extensions.soap.SOAPOperation object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Header Fault</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPHeaderFault(javax.wsdl.extensions.soap.SOAPHeaderFault object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>ISOAP 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>ISOAP Header</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseISOAPHeader(javax.wsdl.extensions.soap.SOAPHeader object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseWSDLElement(WSDLElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>IExtensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseIExtensibilityElement(ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>Extensibility Element</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public Object caseExtensibilityElement(org.eclipse.wst.wsdl.ExtensibilityElement object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch, but this is the last case anyway.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-   * @generated
-   */
-  public Object defaultCase(EObject object)
-  {
-    return null;
-  }
-
-} //SOAPSwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
deleted file mode 100644
index 9554345..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model SOAP Binding Extension API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
deleted file mode 100644
index c2cb92a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model SOAP Binding Extension API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/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 f25e224..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Binding.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Binding#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Binding#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Binding#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Binding#getEBindingOperations <em>EBinding Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBinding_QName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBinding_Undefined()
-   * @model
-   * @generated
-   */
-  boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBinding_EPortType()
-   * @model required="true"
-   * @generated
-   */
-  PortType getEPortType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getBinding_EBindingOperations()
-   * @model type="org.eclipse.wst.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 6e56b56..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingFault.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.BindingFault#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingFault#getEFault <em>EFault</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingFault_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingFault_EFault()
-   * @model required="true"
-   * @generated
-   */
-  Fault getEFault();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 kind="operation"
-   * @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 5cccd62..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingInput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.BindingInput#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingInput#getEInput <em>EInput</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingInput_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingInput_EInput()
-   * @model required="true"
-   * @generated
-   */
-  Input getEInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 kind="operation"
-   * @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 9c23b52..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOperation.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.BindingOperation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingOperation#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingOperation#getEBindingFaults <em>EBinding Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOperation_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOperation_EOperation()
-   * @model required="true"
-   * @generated
-   */
-  Operation getEOperation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOperation_EBindingInput()
-   * @model containment="true"
-   * @generated
-   */
-  BindingInput getEBindingInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOperation_EBindingOutput()
-   * @model containment="true"
-   * @generated
-   */
-  BindingOutput getEBindingOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getBindingOperation_EBindingFaults()
-   * @model type="org.eclipse.wst.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 fb245ff..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/BindingOutput.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.BindingOutput#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.BindingOutput#getEOutput <em>EOutput</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOutput_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getBindingOutput_EOutput()
-   * @model required="true"
-   * @generated
-   */
-  Output getEOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 kind="operation"
-   * @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 f423c2d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Definition.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Definition#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEImports <em>EImports</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getETypes <em>ETypes</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEMessages <em>EMessages</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEPortTypes <em>EPort Types</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEBindings <em>EBindings</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getEServices <em>EServices</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Definition#getENamespaces <em>ENamespaces</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getDefinition_TargetNamespace()
-   * @model
-   * @generated
-   */
-  String getTargetNamespace();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getDefinition_Location()
-   * @model
-   * @generated
-   */
-  String getLocation();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getDefinition_QName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getDefinition_Encoding()
-   * @model
-   * @generated
-   */
-  String getEncoding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_EMessages()
-   * @model type="org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_EPortTypes()
-   * @model type="org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_EBindings()
-   * @model type="org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_EServices()
-   * @model type="org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_ENamespaces()
-   * @model type="org.eclipse.wst.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.wst.wsdl.WSDLPackage#getDefinition_ETypes()
-   * @model containment="true"
-   * @generated
-   */
-  Types getETypes();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getDefinition_EImports()
-   * @model type="org.eclipse.wst.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 kind="operation" dataType="org.eclipse.wst.wsdl.DOMDocument"
-   * @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 documentDataType="org.eclipse.wst.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 287b417..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibilityElement.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.ExtensibilityElement#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.ExtensibilityElement#getElementType <em>Element Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getExtensibilityElement_Required()
-   * @model
-   * @generated
-   */
-  boolean isRequired();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getExtensibilityElement_ElementType()
-   * @model dataType="org.eclipse.wst.wsdl.QName" transient="true"
-   * @generated
-   */
-  QName getElementType();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 f73f2fc..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/ExtensibleElement.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.ExtensibleElement#getEExtensibilityElements <em>EExtensibility Elements</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getExtensibleElement_EExtensibilityElements()
-   * @model type="org.eclipse.wst.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 kind="operation" many="false"
-   * @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 7af018b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Fault.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.WSDLPackage#getFault()
- * @model
- * @generated
- */
-public interface Fault extends MessageReference, 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 beb70d7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Import.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Import#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Import#getLocationURI <em>Location URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Import#getEDefinition <em>EDefinition</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Import#getESchema <em>ESchema</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getImport()
- * @model
- * @generated
- */
-public interface Import extends ExtensibleElement, 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.wst.wsdl.WSDLPackage#getImport_NamespaceURI()
-   * @model
-   * @generated
-   */
-  String getNamespaceURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getImport_LocationURI()
-   * @model
-   * @generated
-   */
-  String getLocationURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getImport_EDefinition()
-   * @model
-   * @generated
-   */
-  Definition getEDefinition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getImport_ESchema()
-   * @model
-   * @generated
-   */
-  XSDSchema getESchema();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 kind="operation"
-   * @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 349ad56..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Input.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.WSDLPackage#getInput()
- * @model
- * @generated
- */
-public interface Input extends MessageReference, 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 be692ee..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Message.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Message#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Message#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Message#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getMessage()
- * @model
- * @generated
- */
-public interface Message extends ExtensibleElement, 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.wst.wsdl.WSDLPackage#getMessage_QName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getMessage_Undefined()
-   * @model
-   * @generated
-   */
-  boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getMessage_EParts()
-   * @model type="org.eclipse.wst.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 77800b7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/MessageReference.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.MessageReference#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.MessageReference#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getMessageReference()
- * @model abstract="true"
- * @generated
- */
-public interface MessageReference extends ExtensibleElement
-{
-  /**
-   * 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.wsdl.WSDLPackage#getMessageReference_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getMessageReference_EMessage()
-   * @model required="true"
-   * @generated
-   */
-  Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 8dbbab5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Namespace.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Namespace#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Namespace#getPrefix <em>Prefix</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getNamespace_URI()
-   * @model
-   * @generated
-   */
-  String getURI();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getNamespace_Prefix()
-   * @model
-   * @generated
-   */
-  String getPrefix();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 792d72c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Operation.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Operation#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Operation#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getOperation()
- * @model
- * @generated
- */
-public interface Operation extends ExtensibleElement, 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.wst.wsdl.WSDLPackage#getOperation_Style()
-   * @model dataType="org.eclipse.wst.wsdl.OperationType"
-   * @generated
-   */
-  OperationType getStyle();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getOperation_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getOperation_Undefined()
-   * @model
-   * @generated
-   */
-  boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getOperation_EInput()
-   * @model containment="true"
-   * @generated
-   */
-  Input getEInput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getOperation_EOutput()
-   * @model containment="true"
-   * @generated
-   */
-  Output getEOutput();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getOperation_EFaults()
-   * @model type="org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getOperation_EParameterOrdering()
-   * @model type="org.eclipse.wst.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 e209ee1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Output.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.WSDLPackage#getOutput()
- * @model
- * @generated
- */
-public interface Output extends MessageReference, 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 99f5af8..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Part.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Part#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Part#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Part#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Part#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Part#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Part#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getPart()
- * @model
- * @generated
- */
-public interface Part extends ExtensibleElement, 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.wst.wsdl.WSDLPackage#getPart_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPart_ElementName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getElementName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPart_TypeName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getTypeName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPart_TypeDefinition()
-   * @model
-   * @generated
-   */
-  XSDTypeDefinition getTypeDefinition();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPart_ElementDeclaration()
-   * @model
-   * @generated
-   */
-  XSDElementDeclaration getElementDeclaration();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPart_EMessage()
-   * @model
-   * @generated
-   */
-  Message getEMessage();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 48d5b7d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Port.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Port#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Port#getEBinding <em>EBinding</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPort_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPort_EBinding()
-   * @model required="true"
-   * @generated
-   */
-  Binding getEBinding();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 09c2041..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/PortType.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.PortType#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.PortType#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.PortType#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getPortType()
- * @model
- * @generated
- */
-public interface PortType extends ExtensibleElement, 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.wst.wsdl.WSDLPackage#getPortType_QName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getPortType_Undefined()
-   * @model
-   * @generated
-   */
-  boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getPortType_EOperations()
-   * @model type="org.eclipse.wst.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 049ff36..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Service.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.Service#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Service#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.Service#getEPorts <em>EPorts</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getService_QName()
-   * @model dataType="org.eclipse.wst.wsdl.QName"
-   * @generated
-   */
-  QName getQName();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getService_Undefined()
-   * @model
-   * @generated
-   */
-  boolean isUndefined();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.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.wst.wsdl.WSDLPackage#getService_EPorts()
-   * @model type="org.eclipse.wst.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 dee097c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/Types.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.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 kind="operation" many="false"
-   * @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 many="false"
-   * @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 1044862..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/UnknownExtensibilityElement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.UnknownExtensibilityElement#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.wsdl.WSDLPackage#getUnknownExtensibilityElement()
- * @model
- * @generated
- */
-public interface UnknownExtensibilityElement extends ExtensibilityElement
-{
-  /**
-   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.wst.wsdl.UnknownExtensibilityElement}.
-   * <!-- 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>' containment reference list.
-   * @see org.eclipse.wst.wsdl.WSDLPackage#getUnknownExtensibilityElement_Children()
-   * @model type="org.eclipse.wst.wsdl.UnknownExtensibilityElement" containment="true"
-   * @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 cba3dd9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLElement.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.WSDLElement#getDocumentationElement <em>Documentation Element</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.WSDLElement#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getWSDLElement_DocumentationElement()
-   * @model dataType="org.eclipse.wst.wsdl.DOMElement"
-   * @generated
-   */
-  Element getDocumentationElement();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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.wst.wsdl.WSDLPackage#getWSDLElement_Element()
-   * @model dataType="org.eclipse.wst.wsdl.DOMElement" transient="true"
-   * @generated
-   */
-  Element getElement();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 kind="operation"
-   * @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 a18e057..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLFactory.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.WSDLPackage
- * @generated
- */
-public interface WSDLFactory extends EFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  WSDLFactory eINSTANCE = org.eclipse.wst.wsdl.internal.impl.WSDLFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Port Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port Type</em>'.
-   * @generated
-   */
-  PortType createPortType();
-
-  /**
-   * Returns a new object of class '<em>Operation</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Operation</em>'.
-   * @generated
-   */
-  Operation createOperation();
-
-  /**
-   * Returns a new object of class '<em>Message</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Message</em>'.
-   * @generated
-   */
-  Message createMessage();
-
-  /**
-   * Returns a new object of class '<em>Part</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Part</em>'.
-   * @generated
-   */
-  Part createPart();
-
-  /**
-   * Returns a new object of class '<em>Binding</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding</em>'.
-   * @generated
-   */
-  Binding createBinding();
-
-  /**
-   * Returns a new object of class '<em>Binding Operation</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Operation</em>'.
-   * @generated
-   */
-  BindingOperation createBindingOperation();
-
-  /**
-   * Returns a new object of class '<em>Service</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Service</em>'.
-   * @generated
-   */
-  Service createService();
-
-  /**
-   * Returns a new object of class '<em>Port</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Port</em>'.
-   * @generated
-   */
-  Port createPort();
-
-  /**
-   * Returns a new object of class '<em>Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Extensibility Element</em>'.
-   * @generated
-   */
-  ExtensibilityElement createExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>Definition</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Definition</em>'.
-   * @generated
-   */
-  Definition createDefinition();
-
-  /**
-   * Returns a new object of class '<em>Import</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Import</em>'.
-   * @generated
-   */
-  Import createImport();
-
-  /**
-   * Returns a new object of class '<em>Input</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Input</em>'.
-   * @generated
-   */
-  Input createInput();
-
-  /**
-   * Returns a new object of class '<em>Output</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Output</em>'.
-   * @generated
-   */
-  Output createOutput();
-
-  /**
-   * Returns a new object of class '<em>Fault</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Fault</em>'.
-   * @generated
-   */
-  Fault createFault();
-
-  /**
-   * Returns a new object of class '<em>Binding Input</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Input</em>'.
-   * @generated
-   */
-  BindingInput createBindingInput();
-
-  /**
-   * Returns a new object of class '<em>Binding Output</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Output</em>'.
-   * @generated
-   */
-  BindingOutput createBindingOutput();
-
-  /**
-   * Returns a new object of class '<em>Binding Fault</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Binding Fault</em>'.
-   * @generated
-   */
-  BindingFault createBindingFault();
-
-  /**
-   * Returns a new object of class '<em>Namespace</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Namespace</em>'.
-   * @generated
-   */
-  Namespace createNamespace();
-
-  /**
-   * Returns a new object of class '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Types</em>'.
-   * @generated
-   */
-  Types createTypes();
-
-  /**
-   * Returns a new object of class '<em>Unknown Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Unknown Extensibility Element</em>'.
-   * @generated
-   */
-  UnknownExtensibilityElement createUnknownExtensibilityElement();
-
-  /**
-   * Returns a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Schema Extensibility Element</em>'.
-   * @generated
-   */
-  XSDSchemaExtensibilityElement createXSDSchemaExtensibilityElement();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  WSDLPackage getWSDLPackage();
-
-  /*
-   * 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 f963285..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
+++ /dev/null
@@ -1,4590 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The WSDL model contains classes for the Web Services Description Language (WSDL).
- * 
- * WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.
- * 
- * WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.
- * 
- * The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)
- * - 2.1 Definition, shows the WSDL definition element and the WSDL document structure
- * - 2.1.1 Naming and Linking, shows the namespace and import mechanism
- * - 2.1.3 Extensibility, shows the WSDL extensibility mechanism
- * - 2.2 Types, shows the use of XML Schema types in WSDL
- * - 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.
- * 
- * The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces.
- * <!-- end-model-doc -->
- * @see org.eclipse.wst.wsdl.WSDLFactory
- * @model kind="package"
- * @generated
- */
-public interface WSDLPackage extends EPackage
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "wsdl"; //$NON-NLS-1$
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.eclipse.org/wsdl/2003/WSDL"; //$NON-NLS-1$
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "wsdl"; //$NON-NLS-1$
-
-  /**
-   * 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.wst.wsdl.internal.impl.WSDLElementImpl <em>Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.ExtensibleElementImpl <em>Extensible Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.PortTypeImpl <em>Port Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.PortTypeImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = 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_TYPE__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_TYPE__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 PORT_TYPE__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 PORT_TYPE__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * 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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Port Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PORT_TYPE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl <em>Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.OperationImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = EXTENSIBLE_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 = 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 OPERATION__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Style</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__STYLE = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>EInput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EINPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The feature id for the '<em><b>EOutput</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EOUTPUT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The feature id for the '<em><b>EFaults</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION__EFAULTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * 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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The number of structural features of the '<em>Operation</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OPERATION_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 7;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.MessageImpl <em>Message</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.MessageImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = EXTENSIBLE_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 = 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 MESSAGE__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 MESSAGE__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 MESSAGE__UNDEFINED = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EParts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE__EPARTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Message</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.PartImpl <em>Part</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.PartImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = EXTENSIBLE_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 = 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 PART__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 PART__NAME = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 5;
-
-  /**
-   * The number of structural features of the '<em>Part</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PART_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 6;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingImpl <em>Binding</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.BindingImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EPort Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING__EPORT_TYPE = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * 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 + 3;
-
-  /**
-   * The number of structural features of the '<em>Binding</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int BINDING_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl <em>Binding Operation</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.ServiceImpl <em>Service</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.ServiceImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EPorts</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE__EPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Service</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SERVICE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.PortImpl <em>Port</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.PortImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.ExtensibilityElementImpl <em>Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.DefinitionImpl <em>Definition</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.DefinitionImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EImports</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__EIMPORTS = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * 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 + 5;
-
-  /**
-   * 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 + 6;
-
-  /**
-   * 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 + 7;
-
-  /**
-   * 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 + 8;
-
-  /**
-   * 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 + 9;
-
-  /**
-   * 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 + 10;
-
-  /**
-   * The number of structural features of 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.internal.impl.ImportImpl <em>Import</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.ImportImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = EXTENSIBLE_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 = 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 IMPORT__EEXTENSIBILITY_ELEMENTS = EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * The feature id for the '<em><b>Namespace URI</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT__NAMESPACE_URI = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the '<em>Import</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int IMPORT_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl <em>Message Reference</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl
-   * @see org.eclipse.wst.wsdl.internal.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 = EXTENSIBLE_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 = 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 MESSAGE_REFERENCE__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 MESSAGE_REFERENCE__NAME = EXTENSIBLE_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 = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Message Reference</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int MESSAGE_REFERENCE_FEATURE_COUNT = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.wst.wsdl.internal.impl.InputImpl <em>Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.InputImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int INPUT__EEXTENSIBILITY_ELEMENTS = MESSAGE_REFERENCE__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * 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 '<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.internal.impl.OutputImpl <em>Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.OutputImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int OUTPUT__EEXTENSIBILITY_ELEMENTS = MESSAGE_REFERENCE__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * 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 '<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.internal.impl.FaultImpl <em>Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.FaultImpl
-   * @see org.eclipse.wst.wsdl.internal.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>EExtensibility Elements</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int FAULT__EEXTENSIBILITY_ELEMENTS = MESSAGE_REFERENCE__EEXTENSIBILITY_ELEMENTS;
-
-  /**
-   * 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 '<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.internal.impl.BindingInputImpl <em>Binding Input</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.BindingInputImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.BindingOutputImpl <em>Binding Output</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.BindingFaultImpl <em>Binding Fault</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.NamespaceImpl <em>Namespace</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.NamespaceImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.WSDLPackageImpl#getIPortType()
-   * @generated
-   */
-  int IPORT_TYPE = 20;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIOperation()
-   * @generated
-   */
-  int IOPERATION = 21;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIInput()
-   * @generated
-   */
-  int IINPUT = 22;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIOutput()
-   * @generated
-   */
-  int IOUTPUT = 23;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIFault()
-   * @generated
-   */
-  int IFAULT = 24;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIMessage()
-   * @generated
-   */
-  int IMESSAGE = 25;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIPart()
-   * @generated
-   */
-  int IPART = 26;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIService()
-   * @generated
-   */
-  int ISERVICE = 27;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIPort()
-   * @generated
-   */
-  int IPORT = 28;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIBinding()
-   * @generated
-   */
-  int IBINDING = 29;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIBindingOperation()
-   * @generated
-   */
-  int IBINDING_OPERATION = 30;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIBindingInput()
-   * @generated
-   */
-  int IBINDING_INPUT = 31;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIBindingOutput()
-   * @generated
-   */
-  int IBINDING_OUTPUT = 32;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIBindingFault()
-   * @generated
-   */
-  int IBINDING_FAULT = 33;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIExtensibilityElement()
-   * @generated
-   */
-  int IEXTENSIBILITY_ELEMENT = 34;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIDefinition()
-   * @generated
-   */
-  int IDEFINITION = 35;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIImport()
-   * @generated
-   */
-  int IIMPORT = 36;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIList()
-   * @generated
-   */
-  int ILIST = 37;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIMap()
-   * @generated
-   */
-  int IMAP = 38;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIURL()
-   * @generated
-   */
-  int IURL = 39;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getIExtensionRegistry()
-   * @generated
-   */
-  int IEXTENSION_REGISTRY = 40;
-
-  /**
-   * The number of structural features of 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.internal.impl.TypesImpl <em>Types</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.TypesImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.WSDLPackageImpl#getIIterator()
-   * @generated
-   */
-  int IITERATOR = 42;
-
-  /**
-   * The number of structural features of 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.internal.impl.WSDLPackageImpl#getITypes()
-   * @generated
-   */
-  int ITYPES = 43;
-
-  /**
-   * The number of structural features of 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.internal.impl.UnknownExtensibilityElementImpl <em>Unknown Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.impl.XSDSchemaExtensibilityElementImpl <em>XSD Schema Extensibility Element</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl
-   * @see org.eclipse.wst.wsdl.internal.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 '<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.internal.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.internal.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.internal.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.internal.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.internal.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 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 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 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 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 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#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 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#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 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();
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that represent
-   * <ul>
-   *   <li>each class,</li>
-   *   <li>each feature of each class,</li>
-   *   <li>each enum,</li>
-   *   <li>and each data type</li>
-   * </ul>
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl <em>Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getWSDLElement()
-     * @generated
-     */
-    EClass WSDL_ELEMENT = eINSTANCE.getWSDLElement();
-
-    /**
-     * The meta object literal for the '<em><b>Documentation Element</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute WSDL_ELEMENT__DOCUMENTATION_ELEMENT = eINSTANCE.getWSDLElement_DocumentationElement();
-
-    /**
-     * The meta object literal for the '<em><b>Element</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute WSDL_ELEMENT__ELEMENT = eINSTANCE.getWSDLElement_Element();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.PortTypeImpl <em>Port Type</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.PortTypeImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getPortType()
-     * @generated
-     */
-    EClass PORT_TYPE = eINSTANCE.getPortType();
-
-    /**
-     * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PORT_TYPE__QNAME = eINSTANCE.getPortType_QName();
-
-    /**
-     * The meta object literal for the '<em><b>Undefined</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PORT_TYPE__UNDEFINED = eINSTANCE.getPortType_Undefined();
-
-    /**
-     * The meta object literal for the '<em><b>EOperations</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PORT_TYPE__EOPERATIONS = eINSTANCE.getPortType_EOperations();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl <em>Operation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.OperationImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getOperation()
-     * @generated
-     */
-    EClass OPERATION = eINSTANCE.getOperation();
-
-    /**
-     * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute OPERATION__STYLE = eINSTANCE.getOperation_Style();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute OPERATION__NAME = eINSTANCE.getOperation_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Undefined</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute OPERATION__UNDEFINED = eINSTANCE.getOperation_Undefined();
-
-    /**
-     * The meta object literal for the '<em><b>EInput</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OPERATION__EINPUT = eINSTANCE.getOperation_EInput();
-
-    /**
-     * The meta object literal for the '<em><b>EOutput</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OPERATION__EOUTPUT = eINSTANCE.getOperation_EOutput();
-
-    /**
-     * The meta object literal for the '<em><b>EFaults</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OPERATION__EFAULTS = eINSTANCE.getOperation_EFaults();
-
-    /**
-     * The meta object literal for the '<em><b>EParameter Ordering</b></em>' reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference OPERATION__EPARAMETER_ORDERING = eINSTANCE.getOperation_EParameterOrdering();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.MessageImpl <em>Message</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.MessageImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getMessage()
-     * @generated
-     */
-    EClass MESSAGE = eINSTANCE.getMessage();
-
-    /**
-     * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MESSAGE__QNAME = eINSTANCE.getMessage_QName();
-
-    /**
-     * The meta object literal for the '<em><b>Undefined</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MESSAGE__UNDEFINED = eINSTANCE.getMessage_Undefined();
-
-    /**
-     * The meta object literal for the '<em><b>EParts</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MESSAGE__EPARTS = eINSTANCE.getMessage_EParts();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.PartImpl <em>Part</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.PartImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getPart()
-     * @generated
-     */
-    EClass PART = eINSTANCE.getPart();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PART__NAME = eINSTANCE.getPart_Name();
-
-    /**
-     * The meta object literal for the '<em><b>Element Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PART__ELEMENT_NAME = eINSTANCE.getPart_ElementName();
-
-    /**
-     * The meta object literal for the '<em><b>Type Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PART__TYPE_NAME = eINSTANCE.getPart_TypeName();
-
-    /**
-     * The meta object literal for the '<em><b>Type Definition</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PART__TYPE_DEFINITION = eINSTANCE.getPart_TypeDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Element Declaration</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PART__ELEMENT_DECLARATION = eINSTANCE.getPart_ElementDeclaration();
-
-    /**
-     * The meta object literal for the '<em><b>EMessage</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PART__EMESSAGE = eINSTANCE.getPart_EMessage();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingImpl <em>Binding</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.BindingImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getBinding()
-     * @generated
-     */
-    EClass BINDING = eINSTANCE.getBinding();
-
-    /**
-     * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING__QNAME = eINSTANCE.getBinding_QName();
-
-    /**
-     * The meta object literal for the '<em><b>Undefined</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING__UNDEFINED = eINSTANCE.getBinding_Undefined();
-
-    /**
-     * The meta object literal for the '<em><b>EPort Type</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING__EPORT_TYPE = eINSTANCE.getBinding_EPortType();
-
-    /**
-     * The meta object literal for the '<em><b>EBinding Operations</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING__EBINDING_OPERATIONS = eINSTANCE.getBinding_EBindingOperations();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl <em>Binding Operation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getBindingOperation()
-     * @generated
-     */
-    EClass BINDING_OPERATION = eINSTANCE.getBindingOperation();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING_OPERATION__NAME = eINSTANCE.getBindingOperation_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EOperation</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_OPERATION__EOPERATION = eINSTANCE.getBindingOperation_EOperation();
-
-    /**
-     * The meta object literal for the '<em><b>EBinding Input</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_OPERATION__EBINDING_INPUT = eINSTANCE.getBindingOperation_EBindingInput();
-
-    /**
-     * The meta object literal for the '<em><b>EBinding Output</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_OPERATION__EBINDING_OUTPUT = eINSTANCE.getBindingOperation_EBindingOutput();
-
-    /**
-     * The meta object literal for the '<em><b>EBinding Faults</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_OPERATION__EBINDING_FAULTS = eINSTANCE.getBindingOperation_EBindingFaults();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.ServiceImpl <em>Service</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.ServiceImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getService()
-     * @generated
-     */
-    EClass SERVICE = eINSTANCE.getService();
-
-    /**
-     * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SERVICE__QNAME = eINSTANCE.getService_QName();
-
-    /**
-     * The meta object literal for the '<em><b>Undefined</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute SERVICE__UNDEFINED = eINSTANCE.getService_Undefined();
-
-    /**
-     * The meta object literal for the '<em><b>EPorts</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference SERVICE__EPORTS = eINSTANCE.getService_EPorts();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.PortImpl <em>Port</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.PortImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getPort()
-     * @generated
-     */
-    EClass PORT = eINSTANCE.getPort();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PORT__NAME = eINSTANCE.getPort_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EBinding</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference PORT__EBINDING = eINSTANCE.getPort_EBinding();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl <em>Extensibility Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.ExtensibilityElementImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getExtensibilityElement()
-     * @generated
-     */
-    EClass EXTENSIBILITY_ELEMENT = eINSTANCE.getExtensibilityElement();
-
-    /**
-     * The meta object literal for the '<em><b>Required</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute EXTENSIBILITY_ELEMENT__REQUIRED = eINSTANCE.getExtensibilityElement_Required();
-
-    /**
-     * The meta object literal for the '<em><b>Element Type</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute EXTENSIBILITY_ELEMENT__ELEMENT_TYPE = eINSTANCE.getExtensibilityElement_ElementType();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl <em>Definition</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.DefinitionImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getDefinition()
-     * @generated
-     */
-    EClass DEFINITION = eINSTANCE.getDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute DEFINITION__TARGET_NAMESPACE = eINSTANCE.getDefinition_TargetNamespace();
-
-    /**
-     * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute DEFINITION__LOCATION = eINSTANCE.getDefinition_Location();
-
-    /**
-     * The meta object literal for the '<em><b>QName</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute DEFINITION__QNAME = eINSTANCE.getDefinition_QName();
-
-    /**
-     * The meta object literal for the '<em><b>Encoding</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute DEFINITION__ENCODING = eINSTANCE.getDefinition_Encoding();
-
-    /**
-     * The meta object literal for the '<em><b>EImports</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__EIMPORTS = eINSTANCE.getDefinition_EImports();
-
-    /**
-     * The meta object literal for the '<em><b>ETypes</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__ETYPES = eINSTANCE.getDefinition_ETypes();
-
-    /**
-     * The meta object literal for the '<em><b>EMessages</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__EMESSAGES = eINSTANCE.getDefinition_EMessages();
-
-    /**
-     * The meta object literal for the '<em><b>EPort Types</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__EPORT_TYPES = eINSTANCE.getDefinition_EPortTypes();
-
-    /**
-     * The meta object literal for the '<em><b>EBindings</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__EBINDINGS = eINSTANCE.getDefinition_EBindings();
-
-    /**
-     * The meta object literal for the '<em><b>EServices</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__ESERVICES = eINSTANCE.getDefinition_EServices();
-
-    /**
-     * The meta object literal for the '<em><b>ENamespaces</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference DEFINITION__ENAMESPACES = eINSTANCE.getDefinition_ENamespaces();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.ImportImpl <em>Import</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.ImportImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getImport()
-     * @generated
-     */
-    EClass IMPORT = eINSTANCE.getImport();
-
-    /**
-     * The meta object literal for the '<em><b>Namespace URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute IMPORT__NAMESPACE_URI = eINSTANCE.getImport_NamespaceURI();
-
-    /**
-     * The meta object literal for the '<em><b>Location URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute IMPORT__LOCATION_URI = eINSTANCE.getImport_LocationURI();
-
-    /**
-     * The meta object literal for the '<em><b>EDefinition</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference IMPORT__EDEFINITION = eINSTANCE.getImport_EDefinition();
-
-    /**
-     * The meta object literal for the '<em><b>ESchema</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference IMPORT__ESCHEMA = eINSTANCE.getImport_ESchema();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl <em>Extensible Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.ExtensibleElementImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getExtensibleElement()
-     * @generated
-     */
-    EClass EXTENSIBLE_ELEMENT = eINSTANCE.getExtensibleElement();
-
-    /**
-     * The meta object literal for the '<em><b>EExtensibility Elements</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS = eINSTANCE.getExtensibleElement_EExtensibilityElements();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.InputImpl <em>Input</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.InputImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getInput()
-     * @generated
-     */
-    EClass INPUT = eINSTANCE.getInput();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.OutputImpl <em>Output</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.OutputImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getOutput()
-     * @generated
-     */
-    EClass OUTPUT = eINSTANCE.getOutput();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.FaultImpl <em>Fault</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.FaultImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getFault()
-     * @generated
-     */
-    EClass FAULT = eINSTANCE.getFault();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingInputImpl <em>Binding Input</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.BindingInputImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getBindingInput()
-     * @generated
-     */
-    EClass BINDING_INPUT = eINSTANCE.getBindingInput();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING_INPUT__NAME = eINSTANCE.getBindingInput_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EInput</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_INPUT__EINPUT = eINSTANCE.getBindingInput_EInput();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl <em>Binding Output</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getBindingOutput()
-     * @generated
-     */
-    EClass BINDING_OUTPUT = eINSTANCE.getBindingOutput();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING_OUTPUT__NAME = eINSTANCE.getBindingOutput_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EOutput</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_OUTPUT__EOUTPUT = eINSTANCE.getBindingOutput_EOutput();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl <em>Binding Fault</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getBindingFault()
-     * @generated
-     */
-    EClass BINDING_FAULT = eINSTANCE.getBindingFault();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute BINDING_FAULT__NAME = eINSTANCE.getBindingFault_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EFault</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference BINDING_FAULT__EFAULT = eINSTANCE.getBindingFault_EFault();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.NamespaceImpl <em>Namespace</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.NamespaceImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getNamespace()
-     * @generated
-     */
-    EClass NAMESPACE = eINSTANCE.getNamespace();
-
-    /**
-     * The meta object literal for the '<em><b>URI</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute NAMESPACE__URI = eINSTANCE.getNamespace_URI();
-
-    /**
-     * The meta object literal for the '<em><b>Prefix</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute NAMESPACE__PREFIX = eINSTANCE.getNamespace_Prefix();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIPortType()
-     * @generated
-     */
-    EClass IPORT_TYPE = eINSTANCE.getIPortType();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIOperation()
-     * @generated
-     */
-    EClass IOPERATION = eINSTANCE.getIOperation();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIInput()
-     * @generated
-     */
-    EClass IINPUT = eINSTANCE.getIInput();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIOutput()
-     * @generated
-     */
-    EClass IOUTPUT = eINSTANCE.getIOutput();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIFault()
-     * @generated
-     */
-    EClass IFAULT = eINSTANCE.getIFault();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIMessage()
-     * @generated
-     */
-    EClass IMESSAGE = eINSTANCE.getIMessage();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIPart()
-     * @generated
-     */
-    EClass IPART = eINSTANCE.getIPart();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIService()
-     * @generated
-     */
-    EClass ISERVICE = eINSTANCE.getIService();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIPort()
-     * @generated
-     */
-    EClass IPORT = eINSTANCE.getIPort();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIBinding()
-     * @generated
-     */
-    EClass IBINDING = eINSTANCE.getIBinding();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIBindingOperation()
-     * @generated
-     */
-    EClass IBINDING_OPERATION = eINSTANCE.getIBindingOperation();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIBindingInput()
-     * @generated
-     */
-    EClass IBINDING_INPUT = eINSTANCE.getIBindingInput();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIBindingOutput()
-     * @generated
-     */
-    EClass IBINDING_OUTPUT = eINSTANCE.getIBindingOutput();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIBindingFault()
-     * @generated
-     */
-    EClass IBINDING_FAULT = eINSTANCE.getIBindingFault();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIExtensibilityElement()
-     * @generated
-     */
-    EClass IEXTENSIBILITY_ELEMENT = eINSTANCE.getIExtensibilityElement();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIDefinition()
-     * @generated
-     */
-    EClass IDEFINITION = eINSTANCE.getIDefinition();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIImport()
-     * @generated
-     */
-    EClass IIMPORT = eINSTANCE.getIImport();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIList()
-     * @generated
-     */
-    EClass ILIST = eINSTANCE.getIList();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIMap()
-     * @generated
-     */
-    EClass IMAP = eINSTANCE.getIMap();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIURL()
-     * @generated
-     */
-    EClass IURL = eINSTANCE.getIURL();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIExtensionRegistry()
-     * @generated
-     */
-    EClass IEXTENSION_REGISTRY = eINSTANCE.getIExtensionRegistry();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.TypesImpl <em>Types</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.TypesImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getTypes()
-     * @generated
-     */
-    EClass TYPES = eINSTANCE.getTypes();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getIIterator()
-     * @generated
-     */
-    EClass IITERATOR = eINSTANCE.getIIterator();
-
-    /**
-     * The meta object literal 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.internal.impl.WSDLPackageImpl#getITypes()
-     * @generated
-     */
-    EClass ITYPES = eINSTANCE.getITypes();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl <em>Unknown Extensibility Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getUnknownExtensibilityElement()
-     * @generated
-     */
-    EClass UNKNOWN_EXTENSIBILITY_ELEMENT = eINSTANCE.getUnknownExtensibilityElement();
-
-    /**
-     * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN = eINSTANCE.getUnknownExtensibilityElement_Children();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl <em>XSD Schema Extensibility Element</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getXSDSchemaExtensibilityElement()
-     * @generated
-     */
-    EClass XSD_SCHEMA_EXTENSIBILITY_ELEMENT = eINSTANCE.getXSDSchemaExtensibilityElement();
-
-    /**
-     * The meta object literal for the '<em><b>Schema</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA = eINSTANCE.getXSDSchemaExtensibilityElement_Schema();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl <em>Message Reference</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getMessageReference()
-     * @generated
-     */
-    EClass MESSAGE_REFERENCE = eINSTANCE.getMessageReference();
-
-    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute MESSAGE_REFERENCE__NAME = eINSTANCE.getMessageReference_Name();
-
-    /**
-     * The meta object literal for the '<em><b>EMessage</b></em>' reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EReference MESSAGE_REFERENCE__EMESSAGE = eINSTANCE.getMessageReference_EMessage();
-
-    /**
-     * The meta object literal for the '<em>QName</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.xml.namespace.QName
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getQName()
-     * @generated
-     */
-    EDataType QNAME = eINSTANCE.getQName();
-
-    /**
-     * The meta object literal for the '<em>Operation Type</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.OperationType
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getOperationType()
-     * @generated
-     */
-    EDataType OPERATION_TYPE = eINSTANCE.getOperationType();
-
-    /**
-     * The meta object literal for the '<em>DOM Element</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.w3c.dom.Element
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getDOMElement()
-     * @generated
-     */
-    EDataType DOM_ELEMENT = eINSTANCE.getDOMElement();
-
-    /**
-     * The meta object literal for the '<em>Exception</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.WSDLException
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getWSDLException()
-     * @generated
-     */
-    EDataType WSDL_EXCEPTION = eINSTANCE.getWSDLException();
-
-    /**
-     * The meta object literal for the '<em>DOM Document</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.w3c.dom.Document
-     * @see org.eclipse.wst.wsdl.internal.impl.WSDLPackageImpl#getDOMDocument()
-     * @generated
-     */
-    EDataType DOM_DOCUMENT = eINSTANCE.getDOMDocument();
-
-  }
-
-} //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 eaf7653..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 5db6eb5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPluginImplementation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.
-   */
-  public WSDLPluginImplementation()
-  {
-    super();
-
-    // Remember the static instance.
-    //
-    WSDLPlugin.plugin = this;
-  }
-}
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 d7fc130..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/XSDSchemaExtensibilityElement.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.wst.wsdl.XSDSchemaExtensibilityElement#getSchema <em>Schema</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.wst.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.wst.wsdl.WSDLPackage#getXSDSchemaExtensibilityElement_Schema()
-   * @model containment="true"
-   * @generated
-   */
-  XSDSchema getSchema();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.wst.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 e972989..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryDescriptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-import org.osgi.framework.Bundle;
-
-
-public class ExtensibilityElementFactoryDescriptor
-{
-  private final static String CLASS_LOADING_ERROR = "CLASS_LOADING_ERROR";
-
-  protected Bundle bundle;
-
-  protected String namespace;
-
-  protected String className;
-
-  protected Object factory;
-
-  public ExtensibilityElementFactoryDescriptor(String className, String namespace, Bundle bundle)
-  {
-    this.bundle = bundle;
-    this.className = className;
-    this.namespace = namespace;
-  }
-
-  public ExtensibilityElementFactory getExtensiblityElementFactory()
-  {
-    if (factory == null)
-    {
-      try
-      {
-        Class theClass = bundle.loadClass(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;
-  }
-}
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 9b63fb3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 8d8b4de..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/extensibility/ExtensibilityElementFactoryRegistryReader.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.osgi.framework.Bundle;
-
-
-public class ExtensibilityElementFactoryRegistryReader
-{
-  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getSymbolicName();
-
-  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()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  public String resolve(URL platformURL, String relativePath) throws Exception
-  {
-    URL resolvedURL = FileLocator.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)
-        {
-          Bundle pluginBundle = Platform.getBundle(element.getDeclaringExtension().getContributor().getName());
-          String className = childElement.getAttribute(ATT_CLASS);
-          ExtensibilityElementFactoryDescriptor descriptor = new ExtensibilityElementFactoryDescriptor(className, namespace, pluginBundle);
-          extensibilityElementFactoryRegistry.put(namespace, descriptor);
-        }
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-}
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 2dc6ff7..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BaseGenerator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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 0a5f800..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/BindingGenerator.java
+++ /dev/null
@@ -1,736 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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);
-  }
-  
-  public void setDefinition(Definition definition) {
-    this.definition = definition;
-  }
-  
-  public void setBinding(Binding binding) {
-    this.binding = 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)
-  {
-    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
-        {
-          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);
-
-          // don't add required namespace if nothing is really being added
-          if (!newBindingOps.isEmpty()) {
-            addRequiredNamespaces(binding);            
-          }
-          
-          // 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 46b9306..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/ContentGenerator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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();
-  
-  public void setAddressLocation(String addressLocation);
-}
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 71b8580..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/PortGenerator.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 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;
-  private String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  /**
-   * 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();
-  }
-  
-  public void setAddressLocation(String location) {
-    addressLocation = location;
-  }
-
-  /**
-   * 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)
-    {
-      //wtp bug 221024 - namespace and prefixes are not added when add new port
-      addRequiredNamespaces(service.getEnclosingDefinition());
-      contentGenerator.setAddressLocation(addressLocation);
-      contentGenerator.generatePortContent(port);
-    }
-
-    return port;
-  }
-
-  /*
-   * 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(Definition definition)
-  {
-    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 = definition.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);
-          }
-          definition.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;
-  }
-
-  /**
-   * 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 341bff2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionDescriptor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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;
-import org.osgi.framework.Bundle;
-
-
-/*
- * Class which acts as a container to hold information about the extension.
- */
-public class ContentGeneratorExtensionDescriptor
-{
-  protected Bundle bundle;
-
-  protected ContentGenerator contentGenerator;
-
-  protected String namespace;
-
-  protected String name;
-
-  protected String className;
-
-  public ContentGeneratorExtensionDescriptor(Bundle bundle, String classString, String namespace, String name)
-  {
-    this.bundle = bundle;
-    this.namespace = namespace;
-    this.name = name;
-    this.className = classString;
-  }
-
-  public Object getContentGenerator()
-  {
-    try
-    {
-      Class theClass = bundle.loadClass(className);
-      contentGenerator = (ContentGenerator)theClass.newInstance();
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-
-    return contentGenerator;
-  }
-
-  public String getNamespace()
-  {
-    return namespace;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
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 2d5c123..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionFactoryRegistry.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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 16302a5..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/generator/extension/ContentGeneratorExtensionRegistryReader.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 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.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.osgi.framework.Bundle;
-
-
-public class ContentGeneratorExtensionRegistryReader
-{
-  protected static final String PLUGIN_ID = WSDLPlugin.getPlugin().getSymbolicName();
-
-  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()
-  {
-    IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-    IExtensionPoint point = pluginRegistry.getExtensionPoint(PLUGIN_ID, EXTENSION_POINT_ID);
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  public String resolve(URL platformURL, String relativePath) throws Exception
-  {
-    URL resolvedURL = FileLocator.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)
-        {
-          Bundle pluginBundle = Platform.getBundle(element.getDeclaringExtension().getContributor().getName());
-          String className = childElement.getAttribute(ATT_CLASS);
-          ContentGeneratorExtensionDescriptor descriptor = new ContentGeneratorExtensionDescriptor(pluginBundle, 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 cf7256b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.wst.wsdl.internal.impl.BindingFaultImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.BINDING_FAULT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEFault = (InternalEObject)eFault;
-      eFault = (Fault)eResolveProxy(oldEFault);
-      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 Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_FAULT__NAME:
-      return getName();
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-      if (resolve)
-        return getEFault();
-      return basicGetEFault();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_FAULT__NAME:
-      setName((String)newValue);
-      return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-      setEFault((Fault)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_FAULT__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-      setEFault((Fault)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_FAULT__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_FAULT__EFAULT:
-      return eFault != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    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.Literals.BINDING_FAULT__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 bindingOperation = (BindingOperation)getContainer();
-      Operation operation = bindingOperation.getEOperation();
-      String faultName = getName();
-
-      if (operation != null && faultName != null)
-      {
-        javax.wsdl.Fault fault = operation.getFault(faultName);
-
-        if (fault != getFault())
-        {
-          setFault(fault);
-        }
-      }
-    }
-    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 4bdcf8c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ /dev/null
@@ -1,638 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.BindingImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.BindingImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.BindingImpl#getEPortType <em>EPort Type</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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 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.Literals.BINDING;
-  }
-
-  /**
-   * <!-- 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 PortType getEPortType()
-  {
-    if (ePortType != null && ePortType.eIsProxy())
-    {
-      InternalEObject oldEPortType = (InternalEObject)ePortType;
-      ePortType = (PortType)eResolveProxy(oldEPortType);
-      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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-      return ((InternalEList)getEBindingOperations()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING__QNAME:
-      return getQName();
-      case WSDLPackage.BINDING__UNDEFINED:
-      return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-      if (resolve)
-        return getEPortType();
-      return basicGetEPortType();
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-      return getEBindingOperations();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING__QNAME:
-      setQName((QName)newValue);
-      return;
-      case WSDLPackage.BINDING__UNDEFINED:
-      setUndefined(((Boolean)newValue).booleanValue());
-      return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-      setEPortType((PortType)newValue);
-      return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-      getEBindingOperations().clear();
-      getEBindingOperations().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING__QNAME:
-      setQName(QNAME_EDEFAULT);
-      return;
-      case WSDLPackage.BINDING__UNDEFINED:
-      setUndefined(UNDEFINED_EDEFAULT);
-      return;
-      case WSDLPackage.BINDING__EPORT_TYPE:
-      setEPortType((PortType)null);
-      return;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-      getEBindingOperations().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EPORT_TYPE:
-      return ePortType != null;
-      case WSDLPackage.BINDING__EBINDING_OPERATIONS:
-      return eBindingOperations != null && !eBindingOperations.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: "); //$NON-NLS-1$
-    result.append(qName);
-    result.append(", undefined: "); //$NON-NLS-1$
-    result.append(undefined);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
-    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.Literals.BINDING__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.Literals.BINDING__EPORT_TYPE)
-      {
-        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(WSDLConstants.TYPE_ATTRIBUTE), element);
-      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 0bf01b3..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.wst.wsdl.internal.impl.BindingInputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.BINDING_INPUT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEInput = (InternalEObject)eInput;
-      eInput = (Input)eResolveProxy(oldEInput);
-      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 Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_INPUT__NAME:
-      return getName();
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-      if (resolve)
-        return getEInput();
-      return basicGetEInput();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_INPUT__NAME:
-      setName((String)newValue);
-      return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-      setEInput((Input)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_INPUT__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-      setEInput((Input)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_INPUT__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_INPUT__EINPUT:
-      return eInput != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    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.Literals.BINDING_INPUT__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 de383fa..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+++ /dev/null
@@ -1,802 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.BindingOperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl#getEOperation <em>EOperation</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl#getEBindingInput <em>EBinding Input</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl#getEBindingOutput <em>EBinding Output</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BindingOperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.Literals.BINDING_OPERATION;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEOperation = (InternalEObject)eOperation;
-      eOperation = (Operation)eResolveProxy(oldEOperation);
-      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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      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);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      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 super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    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.Literals.BINDING_OPERATION__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)
-      {
-        BindingInput input = getEBindingInput();
-        BindingOutput output = getEBindingOutput();
-
-        String inputName = input != null ? input.getName() : null;
-        String outputName = output != null ? output.getName() : null;
-
-        setOperation(portType.getOperation(getName(), inputName, outputName));
-      }
-    }
-    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 ae9235f..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.wst.wsdl.internal.impl.BindingOutputImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.BINDING_OUTPUT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEOutput = (InternalEObject)eOutput;
-      eOutput = (Output)eResolveProxy(oldEOutput);
-      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 Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-      return getName();
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-      if (resolve)
-        return getEOutput();
-      return basicGetEOutput();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-      setName((String)newValue);
-      return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-      setEOutput((Output)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-      setEOutput((Output)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.BINDING_OUTPUT__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.BINDING_OUTPUT__EOUTPUT:
-      return eOutput != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    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.Literals.BINDING_OUTPUT__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 2b14c9a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ /dev/null
@@ -1,2523 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.XSDConcreteComponent;
-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.wst.wsdl.internal.impl.DefinitionImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEncoding <em>Encoding</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEImports <em>EImports</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getETypes <em>ETypes</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEMessages <em>EMessages</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEPortTypes <em>EPort Types</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEBindings <em>EBindings</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getEServices <em>EServices</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.DefinitionImpl#getENamespaces <em>ENamespaces</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefinitionImpl extends ExtensibleElementImpl implements Definition
-{
-  private static final String XMLNS = "xmlns"; //$NON-NLS-1$
-
-  /**
-   * 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 #getEImports() <em>EImports</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEImports()
-   * @generated
-   * @ordered
-   */
-  protected EList eImports = 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 #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;
-
-  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.Literals.DEFINITION;
-  }
-
-  /**
-   * <!-- 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.Literals.DEFINITION__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, this);
-  }
-
-  /**
-   * <!-- 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, this);
-  }
-
-  /**
-   * <!-- 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, this);
-  }
-
-  /**
-   * <!-- 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, this);
-  }
-
-  /**
-   * <!-- 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)
-  {
-    WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.SERVICE, name);
-    boolean removed = false;
-    if (wsdlElement instanceof Service)
-      removed = getEServices().remove(wsdlElement);
-    if (!removed)
-      wsdlElement = null;
-    return (Service)wsdlElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Binding removeBinding(QName name)
-  {
-    WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.BINDING, name);
-    boolean removed = false;
-    if (wsdlElement instanceof Binding)
-      removed = getEBindings().remove(wsdlElement);
-    if (!removed)
-      wsdlElement = null;
-    return (Binding)wsdlElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.PortType removePortType(QName name)
-  {
-    WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.PORT_TYPE, name);
-    boolean removed = false;
-    if (wsdlElement instanceof PortType)
-      removed = getEPortTypes().remove(wsdlElement);
-    if (!removed)
-      wsdlElement = null;
-    return (PortType)wsdlElement;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public javax.wsdl.Message removeMessage(QName name)
-  {
-    WSDLElement wsdlElement = resolveWSDLElement(WSDLConstants.MESSAGE, name);
-    boolean removed = false;
-    if (wsdlElement instanceof Message)
-      removed = getEMessages().remove(wsdlElement);
-    if (!removed)
-      wsdlElement = null;
-    return (Message)wsdlElement;
-  }
-
-  /**
-   * <!-- 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
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.DEFINITION__EIMPORTS:
-      return ((InternalEList)getEImports()).basicRemove(otherEnd, msgs);
-      case WSDLPackage.DEFINITION__ETYPES:
-      return basicSetETypes(null, 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);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      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__EIMPORTS:
-      return getEImports();
-      case WSDLPackage.DEFINITION__ETYPES:
-      return getETypes();
-      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();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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__EIMPORTS:
-      getEImports().clear();
-      getEImports().addAll((Collection)newValue);
-      return;
-      case WSDLPackage.DEFINITION__ETYPES:
-      setETypes((Types)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;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EIMPORTS:
-      getEImports().clear();
-      return;
-      case WSDLPackage.DEFINITION__ETYPES:
-      setETypes((Types)null);
-      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;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EIMPORTS:
-      return eImports != null && !eImports.isEmpty();
-      case WSDLPackage.DEFINITION__ETYPES:
-      return eTypes != null;
-      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();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- 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 String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (targetNamespace: "); //$NON-NLS-1$
-    result.append(targetNamespace);
-    result.append(", location: "); //$NON-NLS-1$
-    result.append(location);
-    result.append(", qName: "); //$NON-NLS-1$
-    result.append(qName);
-    result.append(", encoding: "); //$NON-NLS-1$
-    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()); //$NON-NLS-1$
-    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, 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;
-  }
-
-  /**
-   * Resolves the element described by type and qname in the context of the
-   * given definition. The definition's imported definitions are checked as well.
-   * 
-   * @param type the element type.
-   * @param qname the element's QName. Must not be null.
-   * @param definition the context definition. Must not be null.
-   * @return the resolved WSDLElement or null if one cannot be found.
-   */
-  private static WSDLElement resolveWSDLElement(int type, QName qname, DefinitionImpl definition)
-  {
-    if (qname == null || qname.getNamespaceURI() == null)
-    {
-      return null;
-    }
-
-    List definitions = new ArrayList();
-    definitions.add(definition);
-    WSDLElement result = resolveWSDLElement(type, qname, definitions, new ArrayList());
-
-    return result;
-  }
-
-  /**
-   * Resolves the element described by type and qname in the context of the
-   * given definitions. The definitions imported definitions are checked as well.
-   * 
-   * IMPORTANT! This method is recursive. It checks the definitions and all their
-   * imported definitions. It also is coded such that it avoids a cyclic import
-   * should one be encountered.
-   * 
-   * @param type the element type.
-   * @param qname the element's qName.
-   * @param definitions the context definitions
-   * @param visitedDefinitions a list with the definitions already visited.
-   * @return the resolved WSDLElement or null if one cannot be found.
-   */
-  private static WSDLElement resolveWSDLElement(int type, QName qname, List definitions, List visitedDefinitions)
-  {
-    WSDLElement result = null;
-
-    if (definitions.isEmpty())
-    {
-      return result;
-    }
-
-    // In order to preserve the old behaviour which used to check the definition
-    // and all first level imports, check the entire list of definitions passed
-    // in first.
-
-    Iterator definitionsIterator = definitions.iterator();
-
-    while (definitionsIterator.hasNext())
-    {
-      DefinitionImpl definition = (DefinitionImpl)definitionsIterator.next();
-
-      result = definition.resolveWSDLElement(type, qname);
-
-      if (result != null)
-      {
-        return result;
-      }
-    }
-
-    // Re-iterate over the definitions and recurse into their imports.
-
-    definitionsIterator = definitions.iterator();
-
-    while (definitionsIterator.hasNext())
-    {
-      DefinitionImpl definition = (DefinitionImpl)definitionsIterator.next();
-
-      if (visitedDefinitions.contains(definition))
-      {
-        // This might happen if we have a case of cyclic imports. Since we
-        // already looked in it, we can and should skip it.
-
-        continue;
-      }
-
-      visitedDefinitions.add(definition);
-
-      List importedDefinitions = definition.getImportedDefinitions(qname.getNamespaceURI());
-
-      result = resolveWSDLElement(type, qname, importedDefinitions, visitedDefinitions);
-
-      if (result != null)
-      {
-        break;
-      }
-    }
-
-    return result;
-  }
-
-  private WSDLElement resolveWSDLElement(int type, QName qname)
-  {
-    WSDLElement result = null;
-    if (qname.getNamespaceURI() != null)
-    {
-      switch (type)
-      {
-        case WSDLConstants.MESSAGE:
-        result = resolveWSDLElement(type, getEMessages(), qname);
-          break;
-        case WSDLConstants.PORT_TYPE:
-        result = resolveWSDLElement(type, getEPortTypes(), qname);
-          break;
-        case WSDLConstants.BINDING:
-        result = resolveWSDLElement(type, getEBindings(), qname);
-          break;
-        case WSDLConstants.SERVICE:
-        result = resolveWSDLElement(type, getEServices(), qname);
-          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); //$NON-NLS-1$
-      oldEventTarget.removeEventListener("DOMNodeRemoved", getEventListener(), true); //$NON-NLS-1$
-      oldEventTarget.removeEventListener("DOMAttrModified", getEventListener(), true); //$NON-NLS-1$
-    }
-    super.setElement(element);
-    if (element instanceof EventTarget)
-    {
-      EventTarget eventTarget = ((EventTarget)element);
-      eventTarget.addEventListener("DOMNodeInserted", getEventListener(), true); //$NON-NLS-1$
-      eventTarget.addEventListener("DOMNodeRemoved", getEventListener(), true); //$NON-NLS-1$
-      eventTarget.addEventListener("DOMAttrModified", getEventListener(), true); //$NON-NLS-1$
-    }
-    if (element != null)
-    {
-      document = element.getOwnerDocument();
-    }
-  }
-
-  protected void reconcileAttributes(Element changedElement)
-  {
-    super.reconcileAttributes(changedElement);
-
-    if (changedElement == getElement())
-    {
-      if (changedElement.hasAttribute(WSDLConstants.TARGETNAMESPACE_ATTRIBUTE))
-        setTargetNamespace(changedElement.getAttribute(WSDLConstants.TARGETNAMESPACE_ATTRIBUTE));
-      if (changedElement.hasAttribute(WSDLConstants.NAME_ATTRIBUTE))
-        setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI, changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE)));
-      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());
-
-    addChildElements(newElement, getEImports());
-
-    Types types = getETypes();
-    if (types != null)
-    {
-      Element child = ((TypesImpl)types).createElement();
-      newElement.appendChild(child);
-    }
-
-    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); //$NON-NLS-1$
-        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.Literals.DEFINITION__QNAME)
-        if (getQName() != null)
-          niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getQName().getLocalPart());
-      if (eAttribute == null || eAttribute == WSDLPackage.Literals.DEFINITION__TARGET_NAMESPACE)
-      {
-        if (getTargetNamespace() != null)
-        {
-          niceSetAttribute(theElement, WSDLConstants.TARGETNAMESPACE_ATTRIBUTE, getTargetNamespace());
-          if (eAttribute != null && !isReconciling)
-          {
-            patchTargetNamespace();
-          }
-        }
-      }
-    }
-  }
-
-  private List getImportedDefinitions(String namespace)
-  {
-    List list = new ArrayList();
-
-    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;
-  }
-
-  private boolean isComponentDefined(XSDConcreteComponent component)
-  {
-    // note the getContainer() test to eliminate 'synthetic' types
-    // that are created by the XMLSchema model when resolution fails   
-    return component != null && component.getContainer() != null;
-  }
-
-  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 (isComponentDefined(result))
-        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 (isComponentDefined(result))
-        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 (isComponentDefined(result))
-        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 (isComponentDefined(result))
-        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();
-    collectImportedSchemas(namespace, list);
-    collectInlinedSchemas(namespace, list);
-    collectInlinedSchemasOfImportedDefinitions(namespace, list);
-    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")) //$NON-NLS-1$
-                    {
-                      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)
-    {
-      Iterator iterator = types.getEExtensibilityElements().iterator();
-      while(iterator.hasNext())
-      {
-        ExtensibilityElement extensibilityElement = (ExtensibilityElement)iterator.next();
-        if (!(extensibilityElement instanceof XSDSchemaExtensibilityElement))
-        {
-          continue;
-        }
-        XSDSchemaExtensibilityElement el = (XSDSchemaExtensibilityElement) extensibilityElement;
-        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)
-          {
-
-          }
-        }
-      }
-    }
-  }
-
-
-  /** 
-   *  This method will collect the schemas matching the namespace
-   *  that are inlined directly within this definition.
-   *  
-   *  @param namespace the namespace to match.
-   *  @param list all inline schemas that match the namespace will be added to this list.
-   */
-  protected void collectInlinedSchemas(String namespace, List list)
-  {
-    Types types = getETypes();
-    if (types != null)
-    {
-      List schemas = types.getSchemas();
-      Iterator schemasIterator = schemas.iterator();
-      while(schemasIterator.hasNext())
-      {
-        XSDSchema schema = (XSDSchema)schemasIterator.next();
-        String targetNamespace = schema.getTargetNamespace();
-        
-        if (WSDLConstants.isMatchingNamespace(namespace, targetNamespace))
-        {
-          list.add(schema);
-        }
-
-        EList schemaContents = schema.getContents();
-        Iterator schemaContentsIterator = schemaContents.iterator();
-        
-        while (schemaContentsIterator.hasNext())
-        {
-          Object component = schemaContentsIterator.next();
-          if (component instanceof XSDImport)
-          {
-            XSDImport theImport = (XSDImport)component;
-            String importNamespace = theImport.getNamespace();
-            if (WSDLConstants.isMatchingNamespace(namespace, importNamespace))
-            {
-              ((XSDImportImpl)theImport).importSchema();
-              XSDSchema importedSchema = theImport.getResolvedSchema();
-              if (importedSchema != null)
-              {
-                list.add(importedSchema);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /** 
-   *  This method will collect any schema matching the given namespace that are
-   *  imported directly via a wsdl import (e.g. &lt;wsdl:import schemaLocation="Foo.xsd"...)
-   *  
-   *  @param namespace the namespace to match
-   *  @param list all imported schemas that match the namespace will be added to this list.
-   */
-  protected void collectImportedSchemas(String namespace, List list)
-  {
-    EList imports = getEImports();
-    Iterator importsIterator = imports.iterator();
-    while (importsIterator.hasNext())
-    {
-      Import theImport = (Import)importsIterator.next();
-      String importNamespaceURI = theImport.getNamespaceURI();
-      
-      if (WSDLConstants.isMatchingNamespace(importNamespaceURI, namespace))
-      {
-        ((ImportImpl)theImport).importDefinitionOrSchema();
-        XSDSchema schema = theImport.getESchema();
-        
-        if (schema != null && WSDLConstants.isMatchingNamespace(schema.getTargetNamespace(), namespace))
-        {
-          list.add(schema);
-        }
-      }
-    }
-  }
-
-  /** 
-   *  This method will visit any imported wsdl's and collect any contained inlined schemas that match
-   *  the given namespace. 
-   *  
-   *  @param namespace the namespace to match
-   *  @param list all inlined schemas of imported definitions that match the namespace will be added to this list.
-   */
-  protected void collectInlinedSchemasOfImportedDefinitions(String namespace, List list)
-  {
-    EList imports = getEImports();
-    Iterator importsIterator = imports.iterator();
-    while (importsIterator.hasNext())
-    {
-      Import theImport = (Import)importsIterator.next();
-      DefinitionImpl importedDefinition = (DefinitionImpl)theImport.getEDefinition();
-      if (importedDefinition != null)
-      {
-        importedDefinition.collectInlinedSchemas(namespace, list);
-      }
-    }
-  }  
-
-  /**
-   * Propagates the change in the target namespace to all the top level named components.
-   */
-  private void patchTargetNamespace()
-  {
-    EList messages = getEMessages();
-    patchTargetNamespace(messages, WSDLConstants.MESSAGE);
-
-    EList portTypes = getEPortTypes();
-    patchTargetNamespace(portTypes, WSDLConstants.PORT_TYPE);
-
-    EList bindings = getEBindings();
-    patchTargetNamespace(bindings, WSDLConstants.BINDING);
-
-    EList services = getEServices();
-    patchTargetNamespace(services, WSDLConstants.SERVICE);
-  }
-
-  /**
-   * Iterates over the WSDL components in the list and updates their QName. Uses
-   * the component type to determine what type of object is in the list.
-   * 
-   * @param componentsList a list with WSDLElements: messages, port types, bindings or port types.
-   * @param componentType the associated component type as defined in {@link WSDLConstants}
-   */
-  private void patchTargetNamespace(EList componentsList, int componentType)
-  {
-    Iterator componentsIterator = componentsList.iterator();
-    while (componentsIterator.hasNext())
-    {
-      WSDLElement wsdlElement = (WSDLElement)componentsIterator.next();
-      Definition enclosingDefinition = wsdlElement.getEnclosingDefinition();
-      if (enclosingDefinition != null)
-      {
-        String targetNamespace = enclosingDefinition.getTargetNamespace();
-        
-        QName componentQName = getQNameForWSDLElement(componentType, wsdlElement);
-
-        if (componentQName != null)
-        {
-          String localPart = componentQName.getLocalPart();
-          QName newComponentQName = new QName(targetNamespace, localPart);
-          setQNameForWSDLElement(componentType, wsdlElement, newComponentQName);
-        }
-      }
-    }
-  }
-
-  /**
-   * Updates the QName for the given component and component type.
-   * @param type the component type. See {@link WSDLConstants}.
-   * @param wsdlElement the target WSDL element.
-   * @param qName the new component {@link QName}.
-   */
-  private void setQNameForWSDLElement(int type, WSDLElement wsdlElement, QName qName)
-  {
-    switch (type)
-    {
-      case WSDLConstants.MESSAGE:
-        ((Message)wsdlElement).setQName(qName);
-        break;
-      case WSDLConstants.PORT_TYPE:
-        ((PortType)wsdlElement).setQName(qName);
-        break;
-      case WSDLConstants.BINDING:
-        ((Binding)wsdlElement).setQName(qName);
-        break;
-      case WSDLConstants.SERVICE:
-        ((Service)wsdlElement).setQName(qName);
-        break;
-    }
-  }
-} //DefinitionImpl
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 ea73ff2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.ExtensibilityElementImpl#isRequired <em>Required</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.EXTENSIBILITY_ELEMENT;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-      return isRequired() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-      return getElementType();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-      setRequired(((Boolean)newValue).booleanValue());
-      return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-      setElementType((QName)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__REQUIRED:
-      setRequired(REQUIRED_EDEFAULT);
-      return;
-      case WSDLPackage.EXTENSIBILITY_ELEMENT__ELEMENT_TYPE:
-      setElementType(ELEMENT_TYPE_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (required: "); //$NON-NLS-1$
-    result.append(required);
-    result.append(", elementType: "); //$NON-NLS-1$
-    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 5c2604a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibleElementImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.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.Literals.EXTENSIBLE_ELEMENT;
-  }
-
-  /**
-   * <!-- 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-      return ((InternalEList)getEExtensibilityElements()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-      return getEExtensibilityElements();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-      getEExtensibilityElements().clear();
-      getEExtensibilityElements().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-      getEExtensibilityElements().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS:
-      return eExtensibilityElements != null && !eExtensibilityElements.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  //
-  //
-  //
-  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 f0f4e2e..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/FaultImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Message;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.wst.wsdl.Fault;
-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.Literals.FAULT;
-  }
-
-  /**
-   * <!-- 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(Message message)
-  {
-    setEMessage((org.eclipse.wst.wsdl.Message)message);
-  }
-
-  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 017b596..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.XSDConstants;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.w3c.dom.Element;
-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;
-
-
-/**
- * <!-- 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.wst.wsdl.internal.impl.ImportImpl#getNamespaceURI <em>Namespace URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.ImportImpl#getLocationURI <em>Location URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.ImportImpl#getEDefinition <em>EDefinition</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.ImportImpl#getESchema <em>ESchema</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImportImpl extends ExtensibleElementImpl 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;
-
-  /**
-   * The cached value of the '{@link #getESchema() <em>ESchema</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getESchema()
-   * @generated
-   * @ordered
-   */
-  protected XSDSchema eSchema;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ImportImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.Literals.IMPORT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEDefinition = (InternalEObject)eDefinition;
-      eDefinition = (Definition)eResolveProxy(oldEDefinition);
-      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())
-    {
-      InternalEObject oldESchema = (InternalEObject)eSchema;
-      eSchema = (XSDSchema)eResolveProxy(oldESchema);
-      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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      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 super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (namespaceURI: "); //$NON-NLS-1$
-    result.append(namespaceURI);
-    result.append(", locationURI: "); //$NON-NLS-1$
-    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.Literals.IMPORT__NAMESPACE_URI)
-        niceSetAttribute(theElement, WSDLConstants.NAMESPACE_ATTRIBUTE, getNamespaceURI());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.Literals.IMPORT__LOCATION_URI)
-        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)
-    {
-      // KB: bugzilla 118293
-      // If a user changes <wsdl:import> from a WSDL file to an XML Schema file
-      // or the other way around, we should set the variable for the first
-      // <wsdl:import> source to null. Here I am simply setting both variables to null,
-      // which will have the same effect.
-      eDefinition = null;
-      eSchema = null;
-
-      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);
-
-            if (resolvedLocation == null)
-            {
-              return;
-            }
-            
-            URI uri = URI.createURI(resolvedLocation);
-            Resource resolvedResource = resourceSet.getResource(uri, false);
-            if (resolvedResource == null)
-            {
-              try
-              {
-                InputStream inputStream = resourceSet.getURIConverter().createInputStream(uri);
-                resolvedResource = getResource(uri, resourceSet);
-                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;
-  }
-  
-  private static String getRootElementName(String uri)
-  {
-    RootElementNameContentHandler handler = new RootElementNameContentHandler();
-    try
-    {
-      XMLReader reader = XMLReaderFactory.createXMLReader();
-      reader.setContentHandler(handler);
-      reader.parse(uri);
-    }
-    catch (Exception e)
-    {
-      // Explicitly ignore any exceptions.
-    }
-
-    return handler.rootElementName;
-  }
-
-  private static class RootElementNameContentHandler extends DefaultHandler
-  {
-    public String rootElementName;
-
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-    {
-      rootElementName = localName;
-
-      // Throw an exception to make the SAX Parser to stop parsing
-      throw new SAXException("SAXParser intentionally stopped"); //$NON-NLS-1$
-    }
-  }
-  
-  private static final URI XSD_URI = URI.createURI("*.xsd"); //$NON-NLS-1$
-  private static final URI WSDL_URI = URI.createURI("*.wsdl"); //$NON-NLS-1$
-  
-  private static Resource getResource(URI uri, ResourceSet resourceSet)
-  {
-    // Allow the resource set the first chance to create the resource based on
-    // the registered resource factories.
-    
-    Resource resource = resourceSet.createResource(uri);
-    
-    boolean isWsdlOrXsdResource = resource instanceof WSDLResourceImpl || resource instanceof XSDResourceImpl;
-    
-    if (!isWsdlOrXsdResource)
-    {
-      // The URI was not mapped to a WSDL or XSD resource.
-      // Try to peek inside the resource to determine if its an XSD or WSDL document. 
-      
-      String rootElementName = getRootElementName(uri.toString());
-      
-      if (rootElementName != null)
-      {
-        URI resourceURI = null;
-
-        if (XSDConstants.SCHEMA_ELEMENT_TAG.equals(rootElementName))
-        {
-          resourceURI = XSD_URI;
-        }
-        else if (WSDLConstants.DEFINITION_ELEMENT_TAG.equals(rootElementName))
-        {
-          resourceURI = WSDL_URI;
-        }
-        
-        if (resourceURI != null)
-        {
-          resource = resourceSet.createResource(resourceURI);
-          resource.setURI(uri);
-        }
-      }
-    }
-    return resource;
-  }
-} //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 96132de..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/InputImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Message;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.wst.wsdl.Input;
-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.Literals.INPUT;
-  }
-
-  /**
-   * <!-- 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(Message message)
-  {
-    setEMessage((org.eclipse.wst.wsdl.Message)message);
-  }
-
-  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 733fe9a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.MessageImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.MessageImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.MessageImpl#getEParts <em>EParts</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MessageImpl extends ExtensibleElementImpl 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 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;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MessageImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.Literals.MESSAGE;
-  }
-
-  /**
-   * <!-- 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 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE__EPARTS:
-      return ((InternalEList)getEParts()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE__QNAME:
-      return getQName();
-      case WSDLPackage.MESSAGE__UNDEFINED:
-      return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.MESSAGE__EPARTS:
-      return getEParts();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE__QNAME:
-      setQName((QName)newValue);
-      return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-      setUndefined(((Boolean)newValue).booleanValue());
-      return;
-      case WSDLPackage.MESSAGE__EPARTS:
-      getEParts().clear();
-      getEParts().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE__QNAME:
-      setQName(QNAME_EDEFAULT);
-      return;
-      case WSDLPackage.MESSAGE__UNDEFINED:
-      setUndefined(UNDEFINED_EDEFAULT);
-      return;
-      case WSDLPackage.MESSAGE__EPARTS:
-      getEParts().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EPARTS:
-      return eParts != null && !eParts.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: "); //$NON-NLS-1$
-    result.append(qName);
-    result.append(", undefined: "); //$NON-NLS-1$
-    result.append(undefined);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
-    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;
-      }
-      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)
-  {
-    Message message = (Message)component;
-    if (modelObject instanceof Part)
-    {
-      message.getEParts().remove(modelObject);
-      //      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.Literals.MESSAGE__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 df98047..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.MessageReferenceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.MessageReferenceImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MessageReferenceImpl extends ExtensibleElementImpl 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.Literals.MESSAGE_REFERENCE;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEMessage = (InternalEObject)eMessage;
-      eMessage = (Message)eResolveProxy(oldEMessage);
-      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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-      return getName();
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-      if (resolve)
-        return getEMessage();
-      return basicGetEMessage();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-      setName((String)newValue);
-      return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-      setEMessage((Message)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-      setEMessage((Message)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.MESSAGE_REFERENCE__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.MESSAGE_REFERENCE__EMESSAGE:
-      return eMessage != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconciliation methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    setName(WSDLConstants.getAttribute(changedElement, WSDLConstants.NAME_ATTRIBUTE));
-    reconcileReferences(false);
-  }
-
-  public void handleUnreconciledElement(Element child, Collection remainingModelObjects)
-  {
-    super.handleUnreconciledElement(child, 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.Literals.MESSAGE_REFERENCE__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.Literals.MESSAGE_REFERENCE__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(WSDLConstants.MESSAGE_ATTRIBUTE), element);
-      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 acd3329..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.NamespaceImpl#getURI <em>URI</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.NAMESPACE;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.NAMESPACE__URI:
-      return getURI();
-      case WSDLPackage.NAMESPACE__PREFIX:
-      return getPrefix();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.NAMESPACE__URI:
-      setURI((String)newValue);
-      return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-      setPrefix((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.NAMESPACE__URI:
-      setURI(URI_EDEFAULT);
-      return;
-      case WSDLPackage.NAMESPACE__PREFIX:
-      setPrefix(PREFIX_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (URI: "); //$NON-NLS-1$
-    result.append(uri);
-    result.append(", prefix: "); //$NON-NLS-1$
-    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 cf66d81..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.OperationImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#getEInput <em>EInput</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#getEOutput <em>EOutput</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#getEFaults <em>EFaults</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.OperationImpl#getEParameterOrdering <em>EParameter Ordering</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OperationImpl extends ExtensibleElementImpl 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 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)
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected OperationImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return WSDLPackage.Literals.OPERATION;
-  }
-
-  /**
-   * <!-- 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;
-
-      String nsURI = child.getNamespaceURI();
-
-      if (!WSDLConstants.WSDL_NAMESPACE_URI.equals(nsURI))
-      {
-        // Skip over any non-WSDL elements. For example, to support new WSDL 
-        // use cases we have to tolerate extensibility elements at the operation level.
-
-        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 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      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);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      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__EINPUT:
-      return getEInput();
-      case WSDLPackage.OPERATION__EOUTPUT:
-      return getEOutput();
-      case WSDLPackage.OPERATION__EFAULTS:
-      return getEFaults();
-      case WSDLPackage.OPERATION__EPARAMETER_ORDERING:
-      return getEParameterOrdering();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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__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;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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__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;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (style: "); //$NON-NLS-1$
-    result.append(style);
-    result.append(", name: "); //$NON-NLS-1$
-    result.append(name);
-    result.append(", undefined: "); //$NON-NLS-1$
-    result.append(undefined);
-    result.append(')');
-    return result.toString();
-  }
-
-  // 
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    if (changedElement.hasAttribute(WSDLConstants.NAME_ATTRIBUTE))
-    {
-      String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-      if (name != null)
-      {
-        setName(name);
-      }
-    }
-
-    if (changedElement.hasAttribute(WSDLConstants.PARAMETER_ORDER_ATTRIBUTE))
-    {
-      String parameterOrder = changedElement.getAttribute(WSDLConstants.PARAMETER_ORDER_ATTRIBUTE);
-      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;
-      }
-      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)
-  {
-    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.Literals.OPERATION__NAME)
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-      if (eAttribute == WSDLPackage.Literals.OPERATION__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.Literals.OPERATION__EPARAMETER_ORDERING)
-      {
-        // 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, WSDLConstants.PARAMETER_ORDER_ATTRIBUTE, 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 e0ac814..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OutputImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Message;
-
-import org.eclipse.emf.ecore.EClass;
-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.Literals.OUTPUT;
-  }
-
-  /**
-   * <!-- 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(Message message)
-  {
-    setEMessage((org.eclipse.wst.wsdl.Message)message);
-  }
-
-  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 6aa41a6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+++ /dev/null
@@ -1,761 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 javax.wsdl.WSDLException;
-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.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.wst.wsdl.internal.impl.PartImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PartImpl#getElementName <em>Element Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PartImpl#getTypeName <em>Type Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PartImpl#getTypeDefinition <em>Type Definition</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PartImpl#getElementDeclaration <em>Element Declaration</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PartImpl#getEMessage <em>EMessage</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PartImpl extends ExtensibleElementImpl 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.Literals.PART;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldTypeDefinition = (InternalEObject)typeDefinition;
-      typeDefinition = (XSDTypeDefinition)eResolveProxy(oldTypeDefinition);
-      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())
-    {
-      InternalEObject oldElementDeclaration = (InternalEObject)elementDeclaration;
-      elementDeclaration = (XSDElementDeclaration)eResolveProxy(oldElementDeclaration);
-      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())
-    {
-      InternalEObject oldEMessage = (InternalEObject)eMessage;
-      eMessage = (Message)eResolveProxy(oldEMessage);
-      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();
-    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
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      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 super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      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;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- 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 String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    result.append(name);
-    result.append(", elementName: "); //$NON-NLS-1$
-    result.append(elementName);
-    result.append(", typeName: "); //$NON-NLS-1$
-    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, WSDLConstants.NAME_ATTRIBUTE);
-    if (name != null)
-    {
-      setName(name);
-    }
-
-    String elementAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.ELEMENT_ATTRIBUTE);
-    setElementName(elementAttr != null ? createQName(definition, elementAttr, element, true) : null);
-
-    String typeAttr = WSDLConstants.getAttribute(changedElement, WSDLConstants.TYPE_ATTRIBUTE);
-    setTypeName(typeAttr != null ? createQName(definition, typeAttr, element, true) : 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.Literals.PART__NAME)
-        niceSetAttribute(theElement, WSDLConstants.NAME_ATTRIBUTE, getName());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.Literals.PART__TYPE_NAME)
-        if (getTypeName() != null)
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, getTypeName().getNamespaceURI() + "#"
-            + getTypeName().getLocalPart());
-
-      if (eAttribute == null || eAttribute == WSDLPackage.Literals.PART__ELEMENT_NAME)
-        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.Literals.PART__TYPE_DEFINITION)
-      {
-        XSDTypeDefinition typeDefinition = getTypeDefinition();
-        if (typeDefinition != null)
-        {
-          niceSetAttributeURIValue(theElement, WSDLConstants.TYPE_ATTRIBUTE, typeDefinition.getURI());
-        }
-      }
-      if (eReference == null || eReference == WSDLPackage.Literals.PART__ELEMENT_DECLARATION)
-      {
-        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 30d0a08..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-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.wst.wsdl.internal.impl.PortImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.PORT;
-  }
-
-  /**
-   * <!-- 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())
-    {
-      InternalEObject oldEBinding = (InternalEObject)eBinding;
-      eBinding = (Binding)eResolveProxy(oldEBinding);
-      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 Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT__NAME:
-      return getName();
-      case WSDLPackage.PORT__EBINDING:
-      if (resolve)
-        return getEBinding();
-      return basicGetEBinding();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT__NAME:
-      setName((String)newValue);
-      return;
-      case WSDLPackage.PORT__EBINDING:
-      setEBinding((Binding)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT__NAME:
-      setName(NAME_EDEFAULT);
-      return;
-      case WSDLPackage.PORT__EBINDING:
-      setEBinding((Binding)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT__NAME:
-      return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-      case WSDLPackage.PORT__EBINDING:
-      return eBinding != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: "); //$NON-NLS-1$
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    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.Literals.PORT__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.Literals.PORT__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(WSDLConstants.BINDING_ATTRIBUTE), element);
-      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 762909c..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.PortTypeImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PortTypeImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.PortTypeImpl#getEOperations <em>EOperations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PortTypeImpl extends ExtensibleElementImpl 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 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.Literals.PORT_TYPE;
-  }
-
-  /**
-   * <!-- 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 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-      return ((InternalEList)getEOperations()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT_TYPE__QNAME:
-      return getQName();
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-      return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-      return getEOperations();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT_TYPE__QNAME:
-      setQName((QName)newValue);
-      return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-      setUndefined(((Boolean)newValue).booleanValue());
-      return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-      getEOperations().clear();
-      getEOperations().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.PORT_TYPE__QNAME:
-      setQName(QNAME_EDEFAULT);
-      return;
-      case WSDLPackage.PORT_TYPE__UNDEFINED:
-      setUndefined(UNDEFINED_EDEFAULT);
-      return;
-      case WSDLPackage.PORT_TYPE__EOPERATIONS:
-      getEOperations().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EOPERATIONS:
-      return eOperations != null && !eOperations.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: "); //$NON-NLS-1$
-    result.append(qName);
-    result.append(", undefined: "); //$NON-NLS-1$
-    result.append(undefined);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
-    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;
-      }
-      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;
-    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.Literals.PORT_TYPE__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 6a23721..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.impl.ServiceImpl#getQName <em>QName</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.impl.ServiceImpl#isUndefined <em>Undefined</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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 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.Literals.SERVICE;
-  }
-
-  /**
-   * <!-- 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 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.SERVICE__EPORTS:
-      return ((InternalEList)getEPorts()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.SERVICE__QNAME:
-      return getQName();
-      case WSDLPackage.SERVICE__UNDEFINED:
-      return isUndefined() ? Boolean.TRUE : Boolean.FALSE;
-      case WSDLPackage.SERVICE__EPORTS:
-      return getEPorts();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.SERVICE__QNAME:
-      setQName((QName)newValue);
-      return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-      setUndefined(((Boolean)newValue).booleanValue());
-      return;
-      case WSDLPackage.SERVICE__EPORTS:
-      getEPorts().clear();
-      getEPorts().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.SERVICE__QNAME:
-      setQName(QNAME_EDEFAULT);
-      return;
-      case WSDLPackage.SERVICE__UNDEFINED:
-      setUndefined(UNDEFINED_EDEFAULT);
-      return;
-      case WSDLPackage.SERVICE__EPORTS:
-      getEPorts().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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__EPORTS:
-      return ePorts != null && !ePorts.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: "); //$NON-NLS-1$
-    result.append(qName);
-    result.append(", undefined: "); //$NON-NLS-1$
-    result.append(undefined);
-    result.append(')');
-    return result.toString();
-  }
-
-  //
-  // Reconcile methods
-  //
-
-  public void reconcileAttributes(Element changedElement)
-  {
-    Definition definition = getEnclosingDefinition();
-    String name = changedElement.getAttribute(WSDLConstants.NAME_ATTRIBUTE);
-    QName qname = new QName(definition.getTargetNamespace(), name == null ? "" : name); //$NON-NLS-1$
-    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.Literals.SERVICE__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 7de8e3b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/TypesImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.ecore.EClass;
-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.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * <!-- 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.Literals.TYPES;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getSchemas()
-  {
-    List arrayList = new ArrayList();
-    for (Iterator i = getEExtensibilityElements().iterator(); i.hasNext();)
-    {
-      ExtensibilityElement extensibilityElement = (ExtensibilityElement)i.next();
-      if (!(extensibilityElement instanceof XSDSchemaExtensibilityElement))
-      {
-        continue;
-      }
-      XSDSchemaExtensibilityElement xsdee = (XSDSchemaExtensibilityElement) extensibilityElement;
-      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;
-  }
-
-  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.Literals.EXTENSIBLE_ELEMENT__EEXTENSIBILITY_ELEMENTS && 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 (XSDConstants.SCHEMA_ELEMENT_TAG.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();
-      }
-    }
-    else
-    {
-      super.handleUnreconciledElement(child, remainingModelObjects);
-    }
-  }
-
-  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
\ No newline at end of file
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 218441d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/UnknownExtensibilityElementImpl.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 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.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.internal.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.Literals.UNKNOWN_EXTENSIBILITY_ELEMENT;
-  }
-
-  /**
-   * <!-- 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-      return ((InternalEList)getChildren()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-      return getChildren();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-      getChildren().clear();
-      getChildren().addAll((Collection)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-      getChildren().clear();
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.UNKNOWN_EXTENSIBILITY_ELEMENT__CHILDREN:
-      return children != null && !children.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  // 
-  // 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 4235545..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
+++ /dev/null
@@ -1,1631 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 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.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * <!-- 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.wst.wsdl.internal.impl.WSDLElementImpl#getDocumentationElement <em>Documentation Element</em>}</li>
- *   <li>{@link org.eclipse.wst.wsdl.internal.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.Literals.WSDL_ELEMENT;
-  }
-
-  /**
-   * <!-- 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(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-      return getDocumentationElement();
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-      return getElement();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-      setDocumentationElement((Element)newValue);
-      return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-      setElement((Element)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.WSDL_ELEMENT__DOCUMENTATION_ELEMENT:
-      setDocumentationElement(DOCUMENTATION_ELEMENT_EDEFAULT);
-      return;
-      case WSDLPackage.WSDL_ELEMENT__ELEMENT:
-      setElement(ELEMENT_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      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 super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (documentationElement: "); //$NON-NLS-1$
-    result.append(documentationElement);
-    result.append(", element: "); //$NON-NLS-1$
-    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;
-      }
-    }
-
-    if (childElement == null)
-    {
-      ((WSDLElementImpl)wsdlElement).isReconciling = true;
-      childElement = ((WSDLElementImpl)wsdlElement).createElement();
-      ((WSDLElementImpl)wsdlElement).isReconciling = false;
-      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 we're dealing with a documentation element we need to put it first in the list
-      
-      if (referencedElement == null && WSDLConstants.nodeType(childElement) == WSDLConstants.DOCUMENTATION && !eReference.isMany())
-      {
-        // Here we find the first element node in the list, the documentation element needs to go before this element
-        
-        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)
-  {
-    // Delegate to the new form to preserve backward compatibility in case someone
-    // else calls this method.
-
-    return createQName(definition, prefixedName, null);
-  }
-
-  /**
-   * Creates a QName from a prefixed name. Takes into account locally defined
-   * namespace prefixes.
-   * 
-   * @param definition
-   *          the enclosing definition. Must not be null.
-   * @param prefixedName
-   *          the prefixed name to convert to QName
-   * @param element
-   *          the enclosing element. May be null in which case the prefix is
-   *          only looked up among the ones defined at the definition level.
-   * @return the QName equivalent for the given prefixed name, or null if a
-   *         namespace prefix cannot be found for the given namespace URI or if
-   *         the prefixed name is null.
-   */
-  protected QName createQName(Definition definition, String prefixedName, Element element)
-  {
-    return createQName(definition, prefixedName, element, false);
-  }
-  
-  /**
-   * Creates a QName from a prefixed name. Takes into account locally defined
-   * namespace prefixes. Selectively allows null namespace URIs.
-   * 
-   * @param definition
-   *          the enclosing definition. Must not be null.
-   * @param prefixedName
-   *          the prefixed name to convert to QName
-   * @param element
-   *          the enclosing element. May be null in which case the prefix is
-   *          only looked up among the ones defined at the definition level.
-   * @param allowNullNamespaceURI if true and the prefixed name does not have 
-   *          a prefix a QName is constructed and returned using 
-   *          {@link XMLConstants#NULL_NS_URI} for the namespace URI          
-   * @return the QName equivalent for the given prefixed name, or null if a
-   *         namespace prefix cannot be found for the given namespace URI or if
-   *         the prefixed name is null. 
-   */
-  protected QName createQName(Definition definition, String prefixedName, Element element, boolean allowNullNamespaceURI)
-  {
-    QName qname = null;
-    if (prefixedName != null)
-    {
-      int index = prefixedName.indexOf(":"); ////$NON-NLS-1$
-      String prefix = (index == -1) ? "" : prefixedName.substring(0, index); //$NON-NLS-1$
-      String namespace = definition.getNamespace(prefix);
-
-      if (namespace == null && element != null)
-      {
-        // Try to find a locally defined namespace prefix.
-
-        namespace = getNamespaceURIFromPrefix(element, prefix);
-      }
-
-      if (namespace != null || (allowNullNamespaceURI && prefix.length() == 0))
-      {
-        String localPart = prefixedName.substring(index + 1);
-        qname = new QName(namespace, localPart);
-      }
-    }
-    return qname;
-  }
-
-  /**
-   * Given a prefix and a node, finds the namespace URI pointed to by the
-   * prefix. Walks the element containment hierarchy until it finds one or it
-   * reaches the document root.
-   * 
-   * @param node
-   *          the starting node
-   * @param prefix
-   *          the prefix to find an xmlns:prefix=uri for
-   * 
-   * @return the namespace URI or null if not found
-   */
-  private static String getNamespaceURIFromPrefix(Node node, String prefix)
-  {
-    if (node == null || prefix == null)
-    {
-      return null;
-    }
-
-    Node currentNode = node;
-
-    while (currentNode != null && currentNode.getNodeType() == Node.ELEMENT_NODE)
-    {
-      String namespaceURI = getAttributeNS((Element)currentNode, XSDConstants.XMLNS_URI_2000, prefix);
-
-      if (namespaceURI != null)
-      {
-        return namespaceURI;
-      }
-      else
-      {
-        currentNode = currentNode.getParentNode();
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Retrieves an attribute's value.
-   * @param element the containing element.
-   * @param namespaceURI the namespace URI.
-   * @param localPart the local name.
-   * @return the attribute's value if present, or null if not. 
-   */
-  private static String getAttributeNS(Element element, String namespaceURI, String localPart)
-  {
-    String attributeValue = null;
-    Attr attribute = element.getAttributeNodeNS(namespaceURI, localPart);
-
-    if (attribute != null)
-    {
-      attributeValue = attribute.getValue();
-    }
-
-    return attributeValue;
-  }
-
-  //
-  // 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.Literals.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__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.Literals.WSDL_ELEMENT__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();)
-    {
-      Object object = components.next();
-      if (object instanceof WSDLElementImpl)
-      {
-        WSDLElementImpl childWSDLElement = (WSDLElementImpl)object;
-
-        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(":"); //$NON-NLS-1$
-    String nsPrefix  = null;
-    if (index != -1)
-    {
-      nsPrefix = name.substring(0, index);
-    }
-    else
-    {
-      nsPrefix = "xmlns"; //$NON-NLS-1$
-    }
-
-    String namespaceURI = null;
-
-    // First try to locate the namespace URI in the definition's prefix to namespace map.
-    // This will provide backward compatibility for existing clients.
-    
-    Definition enclosingDefinition = getEnclosingDefinition();
-    if (enclosingDefinition != null)
-    {
-      namespaceURI = enclosingDefinition.getNamespace(nsPrefix);
-    }
-
-    // We did not find it at the top level, try to find a locally defined namespace prefix.
-
-    if (namespaceURI == null)
-    {
-      namespaceURI = getNamespaceURIFromPrefix(element, nsPrefix);
-    }
-
-    return namespaceURI;
-  }
-
-  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 fc77558..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.*;
-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 the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static WSDLFactory init()
-  {
-    try
-    {
-      WSDLFactory theWSDLFactory = (WSDLFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/WSDL"); //$NON-NLS-1$ 
-      if (theWSDLFactory != null)
-      {
-        return theWSDLFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new WSDLFactoryImpl();
-  }
-
-  /**
-   * Creates an 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  /**
-   * <!-- 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 NOT
-   */
-  public OperationType createOperationTypeFromString(EDataType eDataType, String initialValue)
-  {
-    if ("REQUEST_RESPONSE".equals(initialValue))
-    {
-      return OperationType.REQUEST_RESPONSE;
-    }
-    else if ("ONE_WAY".equals(initialValue))
-    {
-      return OperationType.ONE_WAY;
-    }
-    else if ("NOTIFICATION".equals(initialValue))
-    {
-      return OperationType.NOTIFICATION;
-    }
-    else if ("SOLICIT_RESPONSE".equals(initialValue))
-    {
-      return OperationType.SOLICIT_RESPONSE;
-    }
-    return null;
-  }
-
-  /**
-   * <!-- 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
-    {
-      ExtensibilityElement extensibilityElement = createUnknownExtensibilityElement();
-      // Provide some information about the extensibility element.
-      
-      QName elementType = new QName(namespace, localName);
-      extensibilityElement.setElementType(elementType);
-      return extensibilityElement;
-    }
-  }
-
-  /*
-   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 c52f1b2..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
+++ /dev/null
@@ -1,2641 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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
-    XSDPackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theWSDLPackage.createPackageContents();
-
-    // Initialize created meta-data
-    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 EReference getPortType_EOperations()
-  {
-    return (EReference)portTypeEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- 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 EReference getOperation_EInput()
-  {
-    return (EReference)operationEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOperation_EOutput()
-  {
-    return (EReference)operationEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOperation_EFaults()
-  {
-    return (EReference)operationEClass.getEStructuralFeatures().get(5);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getOperation_EParameterOrdering()
-  {
-    return (EReference)operationEClass.getEStructuralFeatures().get(6);
-  }
-
-  /**
-   * <!-- 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 EReference getMessage_EParts()
-  {
-    return (EReference)messageEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- 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 EReference getBinding_EPortType()
-  {
-    return (EReference)bindingEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getBinding_EBindingOperations()
-  {
-    return (EReference)bindingEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- 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 EReference getService_EPorts()
-  {
-    return (EReference)serviceEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- 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(6);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_EPortTypes()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(7);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_EBindings()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(8);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_EServices()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(9);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_ENamespaces()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(10);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_ETypes()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(5);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDefinition_EImports()
-  {
-    return (EReference)definitionEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * <!-- 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);
-    createEReference(portTypeEClass, PORT_TYPE__EOPERATIONS);
-
-    operationEClass = createEClass(OPERATION);
-    createEAttribute(operationEClass, OPERATION__STYLE);
-    createEAttribute(operationEClass, OPERATION__NAME);
-    createEAttribute(operationEClass, OPERATION__UNDEFINED);
-    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);
-    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);
-    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);
-    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__EIMPORTS);
-    createEReference(definitionEClass, DEFINITION__ETYPES);
-    createEReference(definitionEClass, DEFINITION__EMESSAGES);
-    createEReference(definitionEClass, DEFINITION__EPORT_TYPES);
-    createEReference(definitionEClass, DEFINITION__EBINDINGS);
-    createEReference(definitionEClass, DEFINITION__ESERVICES);
-    createEReference(definitionEClass, DEFINITION__ENAMESPACES);
-
-    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
-    XSDPackage theXSDPackage = (XSDPackage)EPackage.Registry.INSTANCE.getEPackage(XSDPackage.eNS_URI);
-
-    // Add supertypes to classes
-    portTypeEClass.getESuperTypes().add(this.getExtensibleElement());
-    portTypeEClass.getESuperTypes().add(this.getIPortType());
-    operationEClass.getESuperTypes().add(this.getExtensibleElement());
-    operationEClass.getESuperTypes().add(this.getIOperation());
-    messageEClass.getESuperTypes().add(this.getExtensibleElement());
-    messageEClass.getESuperTypes().add(this.getIMessage());
-    partEClass.getESuperTypes().add(this.getExtensibleElement());
-    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.getExtensibleElement());
-    importEClass.getESuperTypes().add(this.getIImport());
-    extensibleElementEClass.getESuperTypes().add(this.getWSDLElement());
-    inputEClass.getESuperTypes().add(this.getMessageReference());
-    inputEClass.getESuperTypes().add(this.getIInput());
-    outputEClass.getESuperTypes().add(this.getMessageReference());
-    outputEClass.getESuperTypes().add(this.getIOutput());
-    faultEClass.getESuperTypes().add(this.getMessageReference());
-    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.getExtensibleElement());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(wsdlElementEClass, WSDLElement.class, "WSDLElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    EOperation op = addEOperation(wsdlElementEClass, this.getDefinition(), "getEnclosingDefinition", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(wsdlElementEClass, null, "setEnclosingDefinition"); //$NON-NLS-1$
-    addEParameter(op, this.getDefinition(), "definition", 0, 1); //$NON-NLS-1$
-
-    initEClass(portTypeEClass, PortType.class, "PortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(partEClass, Part.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(bindingOperationEClass, BindingOperation.class, "BindingOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(
-      extensibilityElementEClass,
-      ExtensibilityElement.class,
-      "ExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(definitionEClass, this.getDOMDocument(), "getDocument", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(definitionEClass, null, "setDocument"); //$NON-NLS-1$
-    addEParameter(op, this.getDOMDocument(), "document", 0, 1); //$NON-NLS-1$
-
-    initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(importEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(importEClass, null, "setSchema"); //$NON-NLS-1$
-    addEParameter(op, theXSDPackage.getXSDSchema(), "schema", 0, 1); //$NON-NLS-1$
-
-    initEClass(
-      extensibleElementEClass,
-      ExtensibleElement.class,
-      "ExtensibleElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(extensibleElementEClass, this.getIList(), "getExtensibilityElements", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(extensibleElementEClass, null, "addExtensibilityElement"); //$NON-NLS-1$
-    addEParameter(op, this.getIExtensibilityElement(), "extElement", 0, 1); //$NON-NLS-1$
-
-    initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(bindingInputEClass, BindingInput.class, "BindingInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(bindingInputEClass, this.getIInput(), "getInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(bindingInputEClass, null, "setInput"); //$NON-NLS-1$
-    addEParameter(op, this.getIInput(), "input", 0, 1); //$NON-NLS-1$
-
-    initEClass(bindingOutputEClass, BindingOutput.class, "BindingOutput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(bindingOutputEClass, this.getIOutput(), "getOutput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(bindingOutputEClass, null, "setOutput"); //$NON-NLS-1$
-    addEParameter(op, this.getIOutput(), "output", 0, 1); //$NON-NLS-1$
-
-    initEClass(bindingFaultEClass, BindingFault.class, "BindingFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    op = addEOperation(bindingFaultEClass, this.getIFault(), "getFault", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(bindingFaultEClass, null, "setFault"); //$NON-NLS-1$
-    addEParameter(op, this.getIFault(), "fault", 0, 1); //$NON-NLS-1$
-
-    initEClass(namespaceEClass, Namespace.class, "Namespace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(iPortTypeEClass, javax.wsdl.PortType.class, "IPortType", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iPortTypeEClass, null, "addOperation"); //$NON-NLS-1$
-    addEParameter(op, this.getIOperation(), "operation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iPortTypeEClass, this.getIOperation(), "getOperation", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iPortTypeEClass, this.getIList(), "getOperations", 0, 1); //$NON-NLS-1$
-
-    initEClass(iOperationEClass, javax.wsdl.Operation.class, "IOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, null, "addFault"); //$NON-NLS-1$
-    addEParameter(op, this.getIFault(), "fault", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, this.getIFault(), "getFault", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, this.getIMap(), "getFaults", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, this.getIList(), "getParameterOrdering", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, null, "setParameterOrdering"); //$NON-NLS-1$
-    addEParameter(op, this.getIList(), "parameterOrder", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, this.getIInput(), "getInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, null, "setInput"); //$NON-NLS-1$
-    addEParameter(op, this.getIInput(), "input", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, this.getIOutput(), "getOutput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOperationEClass, null, "setOutput"); //$NON-NLS-1$
-    addEParameter(op, this.getIOutput(), "output", 0, 1); //$NON-NLS-1$
-
-    initEClass(iInputEClass, javax.wsdl.Input.class, "IInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iInputEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iInputEClass, null, "setMessage"); //$NON-NLS-1$
-    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
-
-    initEClass(iOutputEClass, javax.wsdl.Output.class, "IOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iOutputEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iOutputEClass, null, "setMessage"); //$NON-NLS-1$
-    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
-
-    initEClass(iFaultEClass, javax.wsdl.Fault.class, "IFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iFaultEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iFaultEClass, null, "setMessage"); //$NON-NLS-1$
-    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
-
-    initEClass(iMessageEClass, javax.wsdl.Message.class, "IMessage", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iMessageEClass, null, "addPart"); //$NON-NLS-1$
-    addEParameter(op, this.getIPart(), "part", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iMessageEClass, this.getIPart(), "getPart", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iMessageEClass, this.getIMap(), "getParts", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iMessageEClass, this.getIList(), "getOrderedParts", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getIList(), "partOrder", 0, 1); //$NON-NLS-1$
-
-    initEClass(iPartEClass, javax.wsdl.Part.class, "IPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iPartEClass, null, "setExtensionAttribute"); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "value", 0, 1); //$NON-NLS-1$
-    addEException(op, this.getWSDLException());
-
-    op = addEOperation(iPartEClass, this.getIIterator(), "getExtensionAttributeNames", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iPartEClass, this.getQName(), "getExtensionAttribute", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    initEClass(iServiceEClass, javax.wsdl.Service.class, "IService", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iServiceEClass, null, "addPort"); //$NON-NLS-1$
-    addEParameter(op, this.getIPort(), "port", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iServiceEClass, this.getIMap(), "getPorts", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iServiceEClass, this.getIPort(), "getPort", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-
-    initEClass(iPortEClass, javax.wsdl.Port.class, "IPort", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iPortEClass, this.getIBinding(), "getBinding", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iPortEClass, null, "setBinding"); //$NON-NLS-1$
-    addEParameter(op, this.getIBinding(), "binding", 0, 1); //$NON-NLS-1$
-
-    initEClass(iBindingEClass, javax.wsdl.Binding.class, "IBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iBindingEClass, null, "addBindingOperation"); //$NON-NLS-1$
-    addEParameter(op, this.getIBindingOperation(), "bindingOperation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingEClass, this.getIBindingOperation(), "getBindingOperation", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingEClass, this.getIList(), "getBindingOperations", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingEClass, this.getIPortType(), "getPortType", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingEClass, null, "setPortType"); //$NON-NLS-1$
-    addEParameter(op, this.getIPortType(), "portType", 0, 1); //$NON-NLS-1$
-
-    initEClass(
-      iBindingOperationEClass,
-      javax.wsdl.BindingOperation.class,
-      "IBindingOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, null, "addBindingFault"); //$NON-NLS-1$
-    addEParameter(op, this.getIBindingFault(), "bindingFault", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, this.getIBindingFault(), "getBindingFault", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, this.getIMap(), "getBindingFaults", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, this.getIOperation(), "getOperation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, null, "setOperation"); //$NON-NLS-1$
-    addEParameter(op, this.getIOperation(), "operation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, this.getIBindingInput(), "getBindingInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, null, "setBindingInput"); //$NON-NLS-1$
-    addEParameter(op, this.getIBindingInput(), "bindingInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, this.getIBindingOutput(), "getBindingOutput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iBindingOperationEClass, null, "setBindingOutput"); //$NON-NLS-1$
-    addEParameter(op, this.getIBindingOutput(), "bindingOutput", 0, 1); //$NON-NLS-1$
-
-    initEClass(iBindingInputEClass, javax.wsdl.BindingInput.class, "IBindingInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      iBindingOutputEClass,
-      javax.wsdl.BindingOutput.class,
-      "IBindingOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iBindingFaultEClass, javax.wsdl.BindingFault.class, "IBindingFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      iExtensibilityElementEClass,
-      javax.wsdl.extensions.ExtensibilityElement.class,
-      "IExtensibilityElement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iDefinitionEClass, javax.wsdl.Definition.class, "IDefinition", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addBinding"); //$NON-NLS-1$
-    addEParameter(op, this.getIBinding(), "binding", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addImport"); //$NON-NLS-1$
-    addEParameter(op, this.getIImport(), "importDef", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addMessage"); //$NON-NLS-1$
-    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addNamespace"); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addPortType"); //$NON-NLS-1$
-    addEParameter(op, this.getIPortType(), "portType", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "addService"); //$NON-NLS-1$
-    addEParameter(op, this.getIService(), "service", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBindingFault(), "createBindingFault", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBindingInput(), "createBindingInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBindingOutput(), "createBindingOutput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBindingOperation(), "createBindingOperation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "createBinding", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIFault(), "createFault", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIImport(), "createImport", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIInput(), "createInput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "createMessage", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIOperation(), "createOperation", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIOutput(), "createOutput", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIPart(), "createPart", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIPort(), "createPort", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "createPortType", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIService(), "createService", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "getBinding", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getBindings", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getImports", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIList(), "getImports", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getMessages", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getNamespace", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getNamespaces", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "getPortType", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getPortTypes", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getPrefix", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIService(), "getService", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getServices", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIExtensionRegistry(), "getExtensionRegistry", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "setExtensionRegistry"); //$NON-NLS-1$
-    addEParameter(op, this.getIExtensionRegistry(), "extensionRegistry", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getDocumentBaseURI", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "setDocumentBaseURI"); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "documentBase", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getITypes(), "createTypes", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIService(), "removeService", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "removeBinding", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "removePortType", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "removeMessage", 0, 1); //$NON-NLS-1$
-    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, this.getITypes(), "getTypes", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(iDefinitionEClass, null, "setTypes"); //$NON-NLS-1$
-    addEParameter(op, this.getITypes(), "types", 0, 1); //$NON-NLS-1$
-
-    initEClass(iImportEClass, javax.wsdl.Import.class, "IImport", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iListEClass, List.class, "IList", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iMapEClass, Map.class, "IMap", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iurlEClass, URL.class, "IURL", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      iExtensionRegistryEClass,
-      ExtensionRegistry.class,
-      "IExtensionRegistry", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(typesEClass, Types.class, "Types", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1); //$NON-NLS-1$
-
-    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1); //$NON-NLS-1$
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
-
-    initEClass(iIteratorEClass, Iterator.class, "IIterator", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(iTypesEClass, javax.wsdl.Types.class, "ITypes", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    initEClass(
-      unknownExtensibilityElementEClass,
-      UnknownExtensibilityElement.class,
-      "UnknownExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(
-      xsdSchemaExtensibilityElementEClass,
-      XSDSchemaExtensibilityElement.class,
-      "XSDSchemaExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    initEClass(messageReferenceEClass, MessageReference.class, "MessageReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-    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); //$NON-NLS-1$
-
-    // Initialize data types
-    initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(operationTypeEDataType, OperationType.class, "OperationType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(domElementEDataType, Element.class, "DOMElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(wsdlExceptionEDataType, WSDLException.class, "WSDLException", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-    initEDataType(domDocumentEDataType, Document.class, "DOMDocument", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-    // 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 5bdb326..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/XSDSchemaExtensibilityElementImpl.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.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.wst.wsdl.internal.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.Literals.XSD_SCHEMA_EXTENSIBILITY_ELEMENT;
-  }
-
-  /**
-   * <!-- 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, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-      return basicSetSchema(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-      return getSchema();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-      setSchema((XSDSchema)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-      setSchema((XSDSchema)null);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__SCHEMA:
-      return schema != null;
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.internal.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.Literals.XSD_SCHEMA_EXTENSIBILITY_ELEMENT__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.Literals.WSDL_ELEMENT__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 4806a45..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLFactoryImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 b6963f6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLReaderImpl.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 0669f6a..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/wsdl4j/WSDLWriterImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 4078b63..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/Reconcilable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 66a20c4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLAdapterFactory.java
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-
-/**
- * <!-- 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.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.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 org.eclipse.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.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 an object of class '{@link org.eclipse.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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.wst.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 8fa5b23..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLDefinitionFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 07daad4..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLModelLocator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 b6bc18b..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLResourceFactoryImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 e933a06..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLSwitch.java
+++ /dev/null
@@ -1,1201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.*;
-
-
-/**
- * <!-- 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.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)
-  {
-    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 WSDLPackage.WSDL_ELEMENT:
-      {
-        WSDLElement wsdlElement = (WSDLElement)theEObject;
-        Object result = caseWSDLElement(wsdlElement);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      case WSDLPackage.PORT_TYPE:
-      {
-        PortType portType = (PortType)theEObject;
-        Object result = casePortType(portType);
-        if (result == null)
-          result = caseExtensibleElement(portType);
-        if (result == null)
-          result = caseIPortType(portType);
-        if (result == null)
-          result = caseWSDLElement(portType);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      case WSDLPackage.OPERATION:
-      {
-        Operation operation = (Operation)theEObject;
-        Object result = caseOperation(operation);
-        if (result == null)
-          result = caseExtensibleElement(operation);
-        if (result == null)
-          result = caseIOperation(operation);
-        if (result == null)
-          result = caseWSDLElement(operation);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      case WSDLPackage.MESSAGE:
-      {
-        Message message = (Message)theEObject;
-        Object result = caseMessage(message);
-        if (result == null)
-          result = caseExtensibleElement(message);
-        if (result == null)
-          result = caseIMessage(message);
-        if (result == null)
-          result = caseWSDLElement(message);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      case WSDLPackage.PART:
-      {
-        Part part = (Part)theEObject;
-        Object result = casePart(part);
-        if (result == null)
-          result = caseExtensibleElement(part);
-        if (result == null)
-          result = caseIPart(part);
-        if (result == null)
-          result = caseWSDLElement(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 = caseExtensibleElement(import_);
-        if (result == null)
-          result = caseIImport(import_);
-        if (result == null)
-          result = caseWSDLElement(import_);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      case WSDLPackage.EXTENSIBLE_ELEMENT:
-      {
-        ExtensibleElement extensibleElement = (ExtensibleElement)theEObject;
-        Object result = caseExtensibleElement(extensibleElement);
-        if (result == null)
-          result = caseWSDLElement(extensibleElement);
-        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 = caseIInput(input);
-        if (result == null)
-          result = caseExtensibleElement(input);
-        if (result == null)
-          result = caseWSDLElement(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 = caseIOutput(output);
-        if (result == null)
-          result = caseExtensibleElement(output);
-        if (result == null)
-          result = caseWSDLElement(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 = caseIFault(fault);
-        if (result == null)
-          result = caseExtensibleElement(fault);
-        if (result == null)
-          result = caseWSDLElement(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;
-      }
-      case WSDLPackage.MESSAGE_REFERENCE:
-      {
-        MessageReference messageReference = (MessageReference)theEObject;
-        Object result = caseMessageReference(messageReference);
-        if (result == null)
-          result = caseExtensibleElement(messageReference);
-        if (result == null)
-          result = caseWSDLElement(messageReference);
-        if (result == null)
-          result = defaultCase(theEObject);
-        return result;
-      }
-      default:
-      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 cae00fe..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/WSDLUtil.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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;
-
-    if (WSDLConstants.isWSDLNamespace(element.getNamespaceURI()))
-    {
-      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();
-  }
-}
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 5c0ab65..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorAdapterFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 85026c6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/util/XSDSchemaLocatorImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 8522de0..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
deleted file mode 100644
index 6ba5ba9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
deleted file mode 100644
index 501eb7d..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 f520b87..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/ExtensibilityElementFactoryRegistry.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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 47645a6..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"definitions"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String DEFINITION_ELEMENT_TAG = "definitions"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"documentation"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String DOCUMENTATION_ELEMENT_TAG = "documentation"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"fault"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String FAULT_ELEMENT_TAG = "fault"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"import"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String IMPORT_ELEMENT_TAG = "import"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"input"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String INPUT_ELEMENT_TAG = "input"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"message"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String MESSAGE_ELEMENT_TAG = "message"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"operation"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"output"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String OUTPUT_ELEMENT_TAG = "output"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"part"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PART_ELEMENT_TAG = "part"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"port"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PORT_ELEMENT_TAG = "port"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"portType"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String PORT_TYPE_ELEMENT_TAG = "portType"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"service"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String SERVICE_ELEMENT_TAG = "service"; //$NON-NLS-1$
-
-  /**
-   * The element tag is <code>"types"</code>.
-   * @see #nodeType(String localName).
-   */
-  public static final String TYPES_ELEMENT_TAG = "types"; //$NON-NLS-1$
-
-  // common
-
-  /**
-   * The attribute is <code>"name"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
-
-  /**
-   * The attribute is <code>"message"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String MESSAGE_ATTRIBUTE = "message"; //$NON-NLS-1$
-
-  /**
-   * The attribute is <code>"binding"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String BINDING_ATTRIBUTE = "binding"; //$NON-NLS-1$
-
-  /**
-   * The attribute is <code>"type"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
-
-  // definitions
-
-  /**
-   * The attribute is <code>"encoding"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String ENCODING_ATTRIBUTE = "encoding"; //$NON-NLS-1$
-
-  /**
-   * The attribute is <code>"targetNamespace"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String TARGETNAMESPACE_ATTRIBUTE = "targetNamespace"; //$NON-NLS-1$
-
-  // binding
-
-  /**
-   * The attribute is <code>"resourceURI"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String RESOURCE_URI_ATTRIBUTE = "resourceURI"; //$NON-NLS-1$
-
-  // part
-
-  /**
-   * The attribute is <code>"element"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String ELEMENT_ATTRIBUTE = "element"; //$NON-NLS-1$
-
-  // import
-
-  /**
-   * The attribute is <code>"location"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String LOCATION_ATTRIBUTE = "location"; //$NON-NLS-1$
-
-  // operation
-
-  /**
-   * The attribute is <code>"parameterOrder"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public final static String PARAMETER_ORDER_ATTRIBUTE = "parameterOrder"; //$NON-NLS-1$
-  
-  /**
-   * The attribute is <code>"namespace"</code>.
-   * @see #getAttribute(Element,String).
-   */
-  public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
-
-  /**
-   * The value <code>"http://schemas.xmlsoap.org/wsdl/"</code>.
-   */
-  public static final String WSDL_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/"; //$NON-NLS-1$
-
-  /**
-   * The value <code>"http://www.w3.org/2001/XMLSchema"</code>.
-   */
-  public static final String XSD_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-
-  /**
-   * 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"; //$NON-NLS-1$
-
-  /**
-   * 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"; //$NON-NLS-1$
-
-  /**
-   * 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"; //$NON-NLS-1$
-
-  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/WSDLDiagnostic.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnostic.java
deleted file mode 100644
index 2e3b204..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnostic.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.w3c.dom.Node;
-
-
-/**
- * Generated by the WSDL model parsing and validation mechanisms.
- * 
- * <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>
- * 
- * This interface is a candidate to becoming a first class WSDL model object.
- */
-public interface WSDLDiagnostic extends Resource.Diagnostic
-{
-  /**
-   * Provides this diagnostic's severity.
-   * 
-   * @return an XSDDiagnosticSeverity
-   */
-  WSDLDiagnosticSeverity getSeverity();
-
-  /**
-   * Sets this diagnostic's severity.
-   * 
-   * @param severity
-   *          the new diagnostic severity.
-   */
-  void setSeverity(WSDLDiagnosticSeverity severity);
-
-  /**
-   * Gets the original message key.
-   * 
-   * @return a String with the original message key.
-   */
-  String getKey();
-
-  /**
-   * Sets the original message key.
-   * @param value the new message key value.
-   */
-  void setKey(String value);
-
-  /**
-   * Gets the DOM Node where the error occurs
-   * 
-   * @return The DOM node where the error occurs
-   */
-  Node getNode();
-
-  /**
-   * Sets the DOM Node where the error occurs
-   * @param node
-   */
-  void setNode(Node node);
-
-  /**
-   * returns the Element where the error occurs
-   * @return - Object of type XSDConcreteComponent if the error
-   * 			comes from the inline schema of a wsdl file
-   * 		 - object of type WSDLElement if the error comes from
-   * 			other part of the wsdl file
-   */
-  Object getContainer();
-
-  /**
-   * Sets the Container of the error
-   * @param container
-   * 			an Object of either XSDConcreteComponent or WSDLElement 
-   */
-  void setContainer(Object container);
-
-  /**
-   * Returns a list with the original message parameters as Strings.
-   * @return  a list with the original message parameters as Strings.
-   */
-  EList getSubstitutions();
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticImpl.java
deleted file mode 100644
index cbe0f17..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.xsd.XSDDiagnostic;
-import org.eclipse.xsd.XSDDiagnosticSeverity;
-import org.w3c.dom.Node;
-
-
-/**
- * Default implementation of the WSDLDiagnostic interface. This class is based
- * on XSDDiagnosticImpl
- * <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>
- */
-public class WSDLDiagnosticImpl extends EObjectImpl implements WSDLDiagnostic
-{
-  /**
-   * The default value of the '{@link #getColumn() <em>Column</em>}'
-   * attribute.
-   * 
-   * @see #getColumn()
-   */
-  protected static final int COLUMN_EDEFAULT = 1;
-
-  /**
-   * The default value of the '{@link #getLine() <em>Line</em>}' attribute.
-   * 
-   * 
-   * @see #getLine()
-   */
-  protected static final int LINE_EDEFAULT = 1;
-
-  /**
-   * The default value of the '{@link #getLocationURI() <em>Location URI</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getLocationURI()
-   */
-  protected static final String LOCATION_URI_EDEFAULT = null;
-
-  /**
-   * The default value of the '{@link #getMessage() <em>Message</em>}'
-   * attribute.
-   * 
-   * @see #getMessage()
-   */
-  protected static final String MESSAGE_EDEFAULT = null;
-
-  /**
-   * The default value of the '{@link #getSeverity() <em>Severity</em>}'
-   * attribute.
-   * 
-   * @see #getSeverity()
-   */
-  protected static final WSDLDiagnosticSeverity SEVERITY_EDEFAULT = WSDLDiagnosticSeverity.FATAL_LITERAL;
-
-  /**
-   * The cached value of the '{@link #getColumn() <em>Column</em>}' attribute.
-   * 
-   * 
-   * @see #getColumn()
-   * 
-   * @ordered
-   */
-  protected int column = COLUMN_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getLine() <em>Line</em>}' attribute.
-   * 
-   * 
-   * @see #getLine()
-   */
-  protected int line = LINE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getLocationURI() <em>Location URI</em>}'
-   * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
-   * @see #getLocationURI()
-   */
-  protected String locationURI = LOCATION_URI_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getMessage() <em>Message</em>}'
-   * attribute.
-   * 
-   * @see #getMessage()
-   */
-  protected String message = MESSAGE_EDEFAULT;
-
-  /**
-   * The cached value of the '{@link #getSeverity() <em>Severity</em>}'
-   * attribute.
-   * 
-   * @see #getSeverity()
-   */
-  protected WSDLDiagnosticSeverity severity = SEVERITY_EDEFAULT;
-
-  /**
-   * The original message key.
-   */
-  protected String key;
-
-  /**
-   * The original message parameters.
-   */
-  protected EList substitutions;
-
-  /**
-   * The Node where the error occurs
-   */
-  protected Node node;
-
-  /**
-   * The WSDLElement or XSDConcreteComponent object where the error occurs
-   */
-  protected Object container;
-
-  /**
-   * Default constructor.
-   */
-  public WSDLDiagnosticImpl()
-  {
-    super();
-  }
-
-  /**
-   * Wraps an XSD diagnostic into a WSDL diagnostic. Used to report problems in
-   * inline schemas.
-   * 
-   * @param xsdDiagnostic
-   *          the XSD diagnostic object to wrap. Must not be null.
-   */
-  public WSDLDiagnosticImpl(XSDDiagnostic xsdDiagnostic)
-  {
-    this();
-    setMessage(xsdDiagnostic.getMessage());
-    setSeverity(getSeverity(xsdDiagnostic.getSeverity()));
-    setLine(xsdDiagnostic.getLine());
-    setColumn(xsdDiagnostic.getColumn());
-    setNode(xsdDiagnostic.getNode());
-    setContainer(xsdDiagnostic.getContainer());
-    setLocation(xsdDiagnostic.getLocation());
-    setKey(xsdDiagnostic.getKey());
-    getSubstitutions().addAll(xsdDiagnostic.getSubstitutions());
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.emf.ecore.resource.Resource$Diagnostic#getColumn()
-   */
-  public int getColumn()
-  {
-    return column;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.emf.ecore.resource.Resource$Diagnostic#getLine()
-   */
-  public int getLine()
-  {
-    return line;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.emf.ecore.resource.Resource$Diagnostic#getLocation()
-   */
-  public String getLocation()
-  {
-    return locationURI;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.emf.ecore.resource.Resource$Diagnostic#getMessage()
-   */
-  public String getMessage()
-  {
-    return message;
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#getSeverity()
-   */
-  public WSDLDiagnosticSeverity getSeverity()
-  {
-    return severity;
-  }
-
-  /**
-   * Converts an XSD diagnostic severity level into a WSDL diagnostic severity
-   * level.
-   * 
-   * @param xsdDiagnosticSeverity
-   *          the source XSD diagnostic severity.
-   * @return the equivalent WSDL diagnostic severity.
-   */
-  private WSDLDiagnosticSeverity getSeverity(XSDDiagnosticSeverity xsdDiagnosticSeverity)
-  {
-    switch (xsdDiagnosticSeverity.getValue())
-    {
-      case XSDDiagnosticSeverity.FATAL:
-      return WSDLDiagnosticSeverity.FATAL_LITERAL;
-      case XSDDiagnosticSeverity.ERROR:
-      return WSDLDiagnosticSeverity.ERROR_LITERAL;
-      case XSDDiagnosticSeverity.WARNING:
-      return WSDLDiagnosticSeverity.WARNING_LITERAL;
-      case XSDDiagnosticSeverity.INFORMATION:
-      return WSDLDiagnosticSeverity.INFORMATION_LITERAL;
-      default:
-      break;
-  }
-  return SEVERITY_EDEFAULT;
-}
-
-  /**
-   * Sets the new value of the column attribute.
-   * 
-   * @param newColumn
-   *          the new column value.
-   */
-  public void setColumn(int newColumn)
-  {
-    column = newColumn;
-  }
-
-  public void setLine(int newLine)
-  {
-    line = newLine;
-  }
-
-  /**
-   * Sets the value of the loaction attribute.
-   * 
-   * @param location
-   *          a String with the new value for the location attribute
-   */
-  public void setLocation(String location)
-  {
-    locationURI = location;
-  }
-
-  /**
-   * Sets a new value for the message attribute.
-   * 
-   * @param newMessage
-   *          a String with the new message.
-   */
-  public void setMessage(String newMessage)
-  {
-    message = newMessage;
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#setSeverity(org.eclipse.wst.wsdl.util.WSDLDiagnosticSeverity)
-   */
-  public void setSeverity(WSDLDiagnosticSeverity newSeverity)
-  {
-    severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#getKey()
-   */
-  public String getKey()
-  {
-    return key;
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#setKey(java.lang.String)
-   */
-  public void setKey(String value)
-  {
-    key = value;
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#getSubstitutions()
-   */
-  public EList getSubstitutions()
-  {
-    if (substitutions == null)
-    {
-      substitutions = new BasicEList();
-    }
-    return substitutions;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#getNode()
-   */
-  public Node getNode()
-  {
-    return node;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#setNode(org.w3c.dom.Node)
-   */
-  public void setNode(Node node)
-  {
-    this.node = node;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#getContainer()
-   */
-  public Object getContainer()
-  {
-    return container;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.util.WSDLDiagnostic#setContainer(java.lang.Object)
-   */
-  public void setContainer(Object container)
-  {
-    this.container = container;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticSeverity.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticSeverity.java
deleted file mode 100644
index 842f808..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLDiagnosticSeverity.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-
-/**
- * WSDL diagnostic severity levels type safe enumeration. This class is similar
- * to XSDDiagnosticSeverity.
- * <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>
- */
-public final class WSDLDiagnosticSeverity extends AbstractEnumerator
-{
-  /**
-   * This is used to indicate that the problem is really bad and that further
-   * processing is likely not possible.
-   * 
-   * @see #FATAL_LITERAL
-   */
-  public static final int FATAL = 0;
-
-  /**
-   * This is used to indicate that the problem is bad and that the schema is
-   * likely not suitable for use.
-   * 
-   * @see #ERROR_LITERAL
-   */
-  public static final int ERROR = 1;
-
-  /**
-   * This is used to indicate that the problem is not too bad and that the
-   * definition is likely suitable for use.
-   * 
-   * @see #WARNING_LITERAL
-   */
-  public static final int WARNING = 2;
-
-  /**
-   * This is used to indicate that the problem is only potential and that the
-   * definition is very likely suitable for use.
-   * 
-   * @see #INFORMATION_LITERAL
-   */
-  public static final int INFORMATION = 3;
-
-  /**
-   * The '<em><b>Fatal</b></em>' literal object.
-   * 
-   * @see #FATAL
-   */
-  public static final WSDLDiagnosticSeverity FATAL_LITERAL = new WSDLDiagnosticSeverity(FATAL, "fatal", "fatal");
-
-  /**
-   * The '<em><b>Error</b></em>' literal object.
-   * 
-   * @see #ERROR
-   */
-  public static final WSDLDiagnosticSeverity ERROR_LITERAL = new WSDLDiagnosticSeverity(ERROR, "error", "error");
-
-  /**
-   * The '<em><b>Warning</b></em>' literal object.
-   * 
-   * @see #WARNING
-   */
-  public static final WSDLDiagnosticSeverity WARNING_LITERAL = new WSDLDiagnosticSeverity(WARNING, "warning", "warning");
-
-  /**
-   * The '<em><b>Information</b></em>' literal object.
-   * 
-   * @see #INFORMATION
-   */
-  public static final WSDLDiagnosticSeverity INFORMATION_LITERAL = new WSDLDiagnosticSeverity(INFORMATION, "information", "information");
-
-  /**
-   * An array of all the '<em><b>Diagnostic Severity</b></em>' enumerators.
-   */
-  private static final WSDLDiagnosticSeverity[] VALUES_ARRAY = new WSDLDiagnosticSeverity []{
-    FATAL_LITERAL,
-    ERROR_LITERAL,
-    WARNING_LITERAL,
-    INFORMATION_LITERAL, };
-
-  /**
-   * A public read-only list of all the '<em><b>Diagnostic Severity</b></em>'
-   * enumerators.
-   */
-  public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-  /**
-   * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the
-   * specified literal value.
-   */
-  public static WSDLDiagnosticSeverity get(String literal)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      WSDLDiagnosticSeverity result = VALUES_ARRAY[i];
-      if (result.toString().equals(literal))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the
-   * specified name.
-   */
-  public static WSDLDiagnosticSeverity getByName(String name)
-  {
-    for (int i = 0; i < VALUES_ARRAY.length; ++i)
-    {
-      WSDLDiagnosticSeverity result = VALUES_ARRAY[i];
-      if (result.getName().equals(name))
-      {
-        return result;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns the '<em><b>Diagnostic Severity</b></em>' literal with the
-   * specified integer value.
-   */
-  public static WSDLDiagnosticSeverity get(int value)
-  {
-    switch (value)
-    {
-      case FATAL:
-      return FATAL_LITERAL;
-      case ERROR:
-      return ERROR_LITERAL;
-      case WARNING:
-      return WARNING_LITERAL;
-      case INFORMATION:
-      return INFORMATION_LITERAL;
-    }
-    return null;
-  }
-
-  /**
-   * Only this class can construct instances.
-   */
-  private WSDLDiagnosticSeverity(int value, String name, String literal)
-  {
-    super(value, name, literal);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLParser.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLParser.java
deleted file mode 100644
index beff1d1..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLParser.java
+++ /dev/null
@@ -1,903 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.lang.reflect.Method;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.WeakHashMap;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-
-import org.eclipse.wst.wsdl.WSDLPlugin;
-import org.eclipse.xsd.XSDPlugin;
-import org.eclipse.xsd.util.DefaultJAXPConfiguration;
-import org.eclipse.xsd.util.JAXPConfiguration;
-import org.eclipse.xsd.util.JAXPPool;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Comment;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-
-/**
- * The <b>SAX Parser</b> for the WSDL model. This class' main responsibility is
- * to compute line/column information for all elements in the source XML
- * document. This information is stored in a map of each node to its user data.
- * <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>
- * 
- * [ISSUE] Most of this class' implementation is a clone of XSDParser. There are
- * plans to work on closely integrating this class and XSDParser to provide for
- * the most efficient processing of inline schemas.
- */
-public class WSDLParser extends DefaultHandler implements LexicalHandler
-{
-  /**
-   * The name of the user data part holding end column location of an element.
-   */
-  private static final String END_COLUMN = "endColumn"; //$NON-NLS-1$
-
-  /**
-   * The name of the user data part holding end line location of an element.
-   */
-  private static final String END_LINE = "endLine"; //$NON-NLS-1$
-
-  /**
-   * The name of the user data part holding start column location of an element.
-   */
-  private static final String START_COLUMN = "startColumn"; //$NON-NLS-1$
-
-  /**
-   * The name of the user data part holding start line location of an element.
-   */
-  private static final String START_LINE = "startLine"; //$NON-NLS-1$
-
-  private static final class LocationMap extends AbstractMap
-  {
-    protected static final int UNSET = Integer.MAX_VALUE;
-    protected Map delegateMap;
-    private int startLine = UNSET;
-    private int startColumn = UNSET;
-    private int endLine = UNSET;
-    private int endColumn = UNSET;
-
-    public Set entrySet()
-    {
-      return getDelegateMap().entrySet();
-    }
-
-    protected Map getDelegateMap()
-    {
-      if (delegateMap == null)
-      {
-        delegateMap = new HashMap();
-        if (startLine != UNSET)
-        {
-          delegateMap.put(START_LINE, new Integer(startLine));
-        }
-        if (startColumn != UNSET)
-        {
-          delegateMap.put(START_COLUMN, new Integer(startColumn));
-        }
-        if (endLine != UNSET)
-        {
-          delegateMap.put(END_LINE, new Integer(endLine));
-        }
-        if (endColumn != UNSET)
-        {
-          delegateMap.put(END_COLUMN, new Integer(endColumn));
-        }
-      }
-      return delegateMap;
-    }
-
-    protected int objectToInt(Object value)
-    {
-      return value == null ? UNSET : ((Integer)value).intValue();
-    }
-
-    protected Object intToObject(int value)
-    {
-      return value == UNSET ? null : new Integer(value);
-    }
-
-    public Object put(Object key, Object value)
-    {
-      Object result;
-      if (delegateMap == null)
-      {
-        if (START_LINE.equals(key))
-        {
-          result = intToObject(startLine);
-          startLine  = objectToInt(value);
-        }
-        else if (END_LINE.equals(key))
-        {
-          result = intToObject(endLine);
-          endLine  = objectToInt(value);
-        }
-        else if (START_COLUMN.equals(key))
-        {
-          result = intToObject(startColumn);
-          startColumn  = objectToInt(value);
-        }
-        else if (END_COLUMN.equals(key))
-        {
-          result = intToObject(endColumn);
-          endColumn  = objectToInt(value);
-        }
-        else
-        {
-          result = getDelegateMap().put(key, value);
-        }
-      }
-      else
-      {
-        result = getDelegateMap().put(key, value);
-      }
-      return result;
-    }
-
-    public int getStartLine()
-    {
-      return delegateMap == null ? startLine : objectToInt(delegateMap.get(START_LINE));
-    }
-
-    public void setStartLine(int startLine)
-    {
-      if (delegateMap == null)
-      {
-        this.startLine = startLine;
-      }
-      else
-      {
-        delegateMap.put(START_LINE, new Integer(startLine));
-      }
-    }
-
-    public int getStartColumn()
-    {
-      return delegateMap == null ? startColumn : objectToInt(delegateMap.get(START_COLUMN));
-    }
-
-    public void setStartColumn(int startColumn)
-    {
-      if (delegateMap == null)
-      {
-        this.startColumn = startColumn;
-      }
-      else
-      {
-        delegateMap.put(START_COLUMN, new Integer(startColumn));
-      }
-    }
-
-    public int getEndLine()
-    {
-      return delegateMap == null ? endLine : objectToInt(delegateMap.get(END_LINE));
-    }
-
-    public void setEndLine(int endLine)
-    {
-      if (delegateMap == null)
-      {
-        this.endLine = endLine;
-      }
-      else
-      {
-        delegateMap.put(END_LINE, new Integer(endLine));
-      }
-    }
-
-    public int getEndColumn()
-    {
-      return delegateMap == null ? endColumn : objectToInt(delegateMap.get("endColumn"));
-    }
-
-    public void setEndColumn(int endColumn)
-    {
-      if (delegateMap == null)
-      {
-        this.endColumn = endColumn;
-      }
-      else
-      {
-        delegateMap.put(END_COLUMN, new Integer(endColumn));
-      }
-    }
-  }
-
-  /**
-   * Holds pairs Node -> Map with user data.
-   * 
-   * @see #END_COLUMN
-   * @see #END_LINE
-   * @see #START_COLUMN
-   * @see #START_LINE
-   * 
-   * A WeakHashMap is used in order to simplify this map's maintenance. As nodes
-   * are garbage collected when not needed anymore, the JVM will take care of
-   * removing entries from this map.
-   */
-  protected static final Map userDataMap = Collections.synchronizedMap(new WeakHashMap());
-
-  private static LocationMap getLocationMap(Node node)
-  {
-    LocationMap result = (LocationMap)userDataMap.get(node);
-    if (result == null)
-    {
-      result = new LocationMap();
-      userDataMap.put(node, result);
-    }
-    return result;
-  }
-
-  /**
-   * Returns the column at which the given node ends.
-   * 
-   * @param node
-   *          the node to query.
-   * @return the column at which the given node ends.
-   */
-  public static int getEndColumn(Node node)
-  {
-    int result = getLocationMap(node).getEndColumn();
-    return result == LocationMap.UNSET ? 1 : result;
-  }
-
-  /**
-   * Returns the line at which the given node ends.
-   * 
-   * @param node
-   *          the node to query.
-   * @return the line at which the given node ends.
-   */
-  public static int getEndLine(Node node)
-  {
-    int result = getLocationMap(node).getEndLine();
-    return result == LocationMap.UNSET ? 1 : result;
-  }
-
-  /**
-   * Returns the column at which the given node starts.
-   * 
-   * @param node
-   *          the node to query.
-   * @return the column at which the given node starts.
-   */
-  public static int getStartColumn(Node node)
-  {
-    int result = getLocationMap(node).getStartColumn();
-    return result == LocationMap.UNSET ? 1 : result;
-  }
-
-  /**
-   * Returns the line at which the given node starts.
-   * 
-   * @param node
-   *          the node to query.
-   * @return the line at which the given node starts.
-   */
-  public static int getStartLine(Node node)
-  {
-    int result = getLocationMap(node).getStartLine();
-    return result == LocationMap.UNSET ? 1 : result;
-  }
-
-  /**
-   * Returns the user data associated with the node. If the node has no user
-   * data, a new empty map is created.
-   * 
-   * @param node
-   *          the node to query.
-   * @return the user data associated with the node.
-   */
-  public static Map getUserData(Node node)
-  {
-    return getLocationMap(node);
-  }
-
-  protected int column;
-
-  List diagnostics = new ArrayList();
-
-  protected Document document;
-
-  protected Element element;
-
-  protected String encoding;
-
-  protected boolean inSchema;
-
-  protected int line;
-
-  protected Locator locator;
-
-  protected SAXParser saxParser;
-
-  protected Stack stack = new Stack();
-
-  protected JAXPPool jaxpPool;
-    
-  /**
-   * Default constructor.
-   */
-  public WSDLParser()
-  {
-    this(Collections.EMPTY_MAP);
-  }
-  
-  /**
-   * Constructs a WSDL parser given a set of parsing options.
-   * 
-   * @param options a Map of String to Object, passed along through the ResourceSet and Resource. 
-   */
-  public WSDLParser(Map options)
-  {
-    JAXPConfiguration config = null;
-    if (options != null)
-    {
-      jaxpPool = (JAXPPool)options.get(WSDLResourceImpl.WSDL_JAXP_POOL);
-      config = (JAXPConfiguration)options.get(WSDLResourceImpl.WSDL_JAXP_CONFIG);
-    }
-    try
-    {
-      if (jaxpPool == null)
-      {      
-        if (config != null)
-        {
-          saxParser = config.createSAXParser(this);
-        }
-        else
-        {
-          saxParser = new DefaultJAXPConfiguration().createSAXParser(this);
-        }
-      }
-      else
-      {
-        saxParser = jaxpPool.getSAXParser(this);
-      }
-    }
-    catch (SAXException exception)
-    {
-      fatalError(exception);
-    }
-    catch (ParserConfigurationException exception)
-    {
-      fatalError(exception);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
-   */
-  public void characters(char[] characters, int start, int length) throws SAXException
-  {
-    Text textNode = document.createTextNode(new String(characters, start, length));
-    element.appendChild(textNode);
-    saveLocation();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-   */
-  public void comment(char[] characters, int start, int length) throws SAXException
-  {
-    Comment commentNode = document.createComment(new String(characters, start, length));
-    if (element == null)
-    {
-      document.appendChild(commentNode);
-    }
-    else
-    {
-      element.appendChild(commentNode);
-    }
-    saveLocation();
-  }
-
-  /**
-   * Creates an empty DOM Document.
-   * 
-   * @return an empty DOM Document or null is a JAXP misconfiguration error
-   *         occurs.
-   */
-  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;
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-   */
-  public void endCDATA()
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#endDocument()
-   */
-  public void endDocument()
-  {
-    element = null;
-    saveLocation();
-    this.locator = null;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#endDTD()
-   */
-  public void endDTD()
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String,
-   *      java.lang.String, java.lang.String)
-   */
-  public void endElement(String uri, String localName, String qName) throws SAXException
-  {
-    saveLocation();
-
-    if (inSchema)
-    {
-      Map userData = XSDParser.getUserData(element);
-      userData.put(END_LINE, new Integer(line));
-      userData.put(END_COLUMN, new Integer(column));
-    }
-    else
-    {
-      LocationMap locationMap = getLocationMap(element);
-      locationMap.setEndLine(line);
-      locationMap.setEndColumn(column);
-    }
-
-
-    if (isSchemaElement(uri, localName))
-    {
-      inSchema = false;
-    }
-
-    element = (Element)stack.pop();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-   */
-  public void endEntity(String name)
-  {
-  }
-
-  public void error(SAXParseException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.ERROR_LITERAL);
-    diagnostic.setMessage(WSDLPlugin.INSTANCE.getString("_UI_IOError_message", new Object []{ exception.getMessage() }));
-    diagnostic.setLine(exception.getLineNumber());
-    diagnostic.setColumn(exception.getColumnNumber());
-    diagnostics.add(diagnostic);
-  }
-
-  protected void fatalError(IOException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.FATAL_LITERAL);
-    diagnostic.setMessage(WSDLPlugin.INSTANCE.getString("_UI_IOError_message", new Object []{ exception.getMessage() }));
-    diagnostics.add(diagnostic);
-  }
-
-  protected void fatalError(ParserConfigurationException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.FATAL_LITERAL);
-    diagnostic.setMessage(WSDLPlugin.INSTANCE.getString("_UI_ParserError_message", new Object []{ exception.getMessage() }));
-    diagnostics.add(diagnostic);
-  }
-
-  public void fatalError(SAXException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.FATAL_LITERAL);
-    diagnostic.setMessage(WSDLPlugin.INSTANCE.getString("_UI_ParserError_message", new Object []{ exception.getMessage() }));
-    diagnostics.add(diagnostic);
-  }
-
-  public void fatalError(SAXParseException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.FATAL_LITERAL);
-    diagnostic.setMessage(WSDLPlugin.INSTANCE.getString("_UI_ParserError_message", new Object []{ exception.getMessage() }));
-    diagnostic.setLine(exception.getLineNumber());
-    diagnostic.setColumn(exception.getColumnNumber());
-    diagnostics.add(diagnostic);
-  }
-
-  /**
-   * Provides a collection with the diagnostics generated during parsing.
-   * 
-   * @return a Collection of {@link WSDLDiagnostic} objects.
-   */
-  public Collection getDiagnostics()
-  {
-    return diagnostics;
-  }
-
-  /**
-   * Provides the DOM document created by parsing the WSDL document.
-   * 
-   * @return the resulting DOM document.
-   */
-  public Document getDocument()
-  {
-    return document;
-  }
-
-  /**
-   * Determines if an element is the root XML schema element.
-   * 
-   * @param uri
-   *          the URI to test.
-   * @param localName
-   *          the element's local name.
-   * @return true if the element is the root XML schema element, false
-   *         otherwise.
-   */
-  private boolean isSchemaElement(String uri, String localName)
-  {
-    if (uri.equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001) && localName.equals(XSDConstants.SCHEMA_ELEMENT_TAG))
-    {
-      return true;
-    }
-    return false;
-  }
-
-  public void parse(InputSource inputSource)
-  {
-    try
-    {
-      saxParser.parse(inputSource, this);
-    }
-    catch (IOException exception)
-    {
-      fatalError(exception);
-    }
-    catch (SAXException exception)
-    {
-      if (diagnostics.isEmpty())
-      {
-        fatalError(exception);
-      }
-    }
-    finally
-    {
-      if (jaxpPool != null)
-      {
-        jaxpPool.releaseSAXParser(saxParser);
-      }
-    }
-  }
-
-  /**
-   * Parses the XML content read from the given input stream.
-   * 
-   * @param inputStream
-   *          the source input stream. Must not be null.
-   */
-  public void parse(InputStream inputStream)
-  {
-    try
-    {
-      saxParser.parse(new InputSource(inputStream), this);
-    }
-    catch (IOException exception)
-    {
-      fatalError(exception);
-    }
-    catch (SAXException exception)
-    {
-      if (diagnostics.isEmpty())
-      {
-        fatalError(exception);
-      }
-    }
-    finally
-    {
-      if (jaxpPool != null)
-      {
-        jaxpPool.releaseSAXParser(saxParser);
-      }
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#processingInstruction(java.lang.String,
-   *      java.lang.String)
-   */
-  public void processingInstruction(String target, String data)
-  {
-    Node processingInstruction = document.createProcessingInstruction(target, data);
-
-    if (stack.isEmpty())
-    {
-      document.appendChild(processingInstruction);
-    }
-    else
-    {
-      element.appendChild(processingInstruction);
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String,
-   *      java.lang.String)
-   */
-  public InputSource resolveEntity(String publicId, String systemId) throws SAXException
-  {
-    InputSource inputSource;
-    if ("-//W3C//DTD XMLSCHEMA 200102//EN".equalsIgnoreCase(publicId))
-    {
-      inputSource = new InputSource(XSDPlugin.INSTANCE.getBaseURL() + "cache/www.w3.org/2001/XMLSchema.dtd");
-      inputSource.setPublicId(publicId);
-    }
-    else if (systemId != null && systemId.startsWith("file://bundleentry:"))
-    {
-      inputSource = new InputSource(systemId.substring(7));
-      inputSource.setPublicId(publicId);
-    }
-    else
-    {
-      try
-      {
-        inputSource = super.resolveEntity(publicId, systemId);
-        if (false)
-        {
-          throw new IOException();
-        }
-      }
-      catch (IOException exception)
-      {
-        throw new SAXException(exception);
-      }
-    }
-
-    return inputSource;
-  }
-
-  /**
-   * Saves the current line and column numbers.
-   */
-  protected void saveLocation()
-  {
-    if (locator != null)
-    {
-      line = locator.getLineNumber();
-      column = locator.getColumnNumber();
-      
-      // The crimson parser seems to give poor coordinates and is 0-based for line
-      // count.
-
-      if (column == -1)
-      {
-        column = 1;
-      }
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#setDocumentLocator(org.xml.sax.Locator)
-   */
-  public void setDocumentLocator(Locator locator)
-  {
-    this.locator = locator;
-    super.setDocumentLocator(locator);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-   */
-  public void startCDATA()
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#startDocument()
-   */
-  public void startDocument()
-  {
-    saveLocation();
-    document = createDocument();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String,
-   *      java.lang.String, java.lang.String)
-   */
-  public void startDTD(String name, String publicId, String systemId)
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String,
-   *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-   */
-  public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
-  {
-    if (!inSchema)
-    {
-      inSchema = isSchemaElement(uri, localName);
-    }
-
-    Element newElement = document.createElementNS(uri, qName);
-
-    for (int index = 0, count = attributes.getLength(); index < count; ++index)
-    {
-      String attributeURI = attributes.getURI(index);
-      String attributeQName = attributes.getQName(index);
-      String attributeValue = attributes.getValue(index);
-
-      if (attributeQName.equals("xmlns") || attributeQName.startsWith("xmlns:")) //$NON-NLS-1$ //$NON-NLS-2$
-      {
-        attributeURI = XSDConstants.XMLNS_URI_2000;
-      }
-      else if ("".equals(attributeURI)) //$NON-NLS-1$
-      {
-        attributeURI = null;
-      }
-
-      newElement.setAttributeNS(attributeURI, attributeQName, attributeValue);
-    }
-
-    if (stack.isEmpty())
-    {
-      document.appendChild(newElement);
-    }
-    else
-    {
-      element.appendChild(newElement);
-    }
-
-    stack.push(element);
-    element = newElement;
-
-    // Make sure we location attributes end up in the XSDParser's user data if
-    // we are inside an inline schema. If not, they should go in the
-    // WSDLParser's user data.
-
-    if (inSchema)
-    {
-      Map userData = XSDParser.getUserData(element);
-      userData.put(START_LINE, new Integer(line));
-      userData.put(START_COLUMN, new Integer(column));
-    }
-    else
-    {
-      LocationMap locationMap = getLocationMap(element);
-      locationMap.setStartLine(line);
-      locationMap.setStartColumn(column);
-    }
-
-    saveLocation();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-   */
-  public void startEntity(String name)
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.xml.sax.helpers.DefaultHandler#warning(org.xml.sax.SAXParseException)
-   */
-  public void warning(SAXParseException exception)
-  {
-    WSDLDiagnosticImpl diagnostic = new WSDLDiagnosticImpl();
-    diagnostic.setSeverity(WSDLDiagnosticSeverity.WARNING_LITERAL);
-    diagnostic.setMessage("DOM:" + exception.getMessage());
-    diagnostic.setLine(exception.getLineNumber());
-    diagnostic.setColumn(exception.getColumnNumber());
-    diagnostics.add(diagnostic);
-  }
-
-  public String getEncoding()
-  {
-    if (locator != null)
-    {
-      try 
-      {
-        Method getEncodingMethod = locator.getClass().getMethod("getEncoding", new Class[]{});
-        if (getEncodingMethod != null)
-        {
-          encoding = (String)getEncodingMethod.invoke(locator, new Object[] {});
-        }
-      }
-      catch (Exception e) 
-      {
-        // If we can't find it, there's nothing we can do...
-      }
-    }
-
-    return encoding;
-  }
-}
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 8c29506..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceFactoryRegistry.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-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 extends ResourceFactoryRegistryImpl
-{
-  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)
-  {
-    return getFactory(uri, null);
-  }
-
-  public Resource.Factory getFactory(URI uri, String contentType)
-  {
-    String uriString = uri.toString();
-
-    Factory factory = parent.getFactory(uri, contentType);
-    Factory defaultFactory = (Factory)INSTANCE.getFactory(URI.createURI(DEFAULT_EXTENSION), contentType);
-
-    // 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"), contentType);
-      }
-      else if (uriString.endsWith("xsd") || uriString.endsWith("XSD"))
-      {
-        // handle cases like "http://xxx/Distance.jws?xsd"
-        //        	
-        factory = parent.getFactory(URI.createURI("*.xsd"), contentType);
-      }
-      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"), contentType);
-          }
-          else if (rootElementName.equals("definitions"))
-          {
-            factory = parent.getFactory(URI.createURI("*.wsdl"), contentType);
-          }
-        }
-      }
-    }
-    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 749b554..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLResourceImpl.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, 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.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.Collection;
-import java.util.HashMap;
-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.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-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.ExtensibilityElement;
-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.DefaultJAXPConfiguration;
-import org.eclipse.xsd.util.JAXPConfiguration;
-import org.eclipse.xsd.util.JAXPPool;
-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.InputSource;
-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 final String USE_EXTENSION_FACTORIES = "USE_EXTENSION_FACTORIES"; //$NON-NLS-1$
-
-  public static final String CONTINUE_ON_LOAD_ERROR = "CONTINUE_ON_LOAD_ERROR"; //$NON-NLS-1$
-
-  public static final String WSDL_ENCODING = "WSDL_ENCODING"; //$NON-NLS-1$
-
-  public static final String WSDL_PROGRESS_MONITOR = "WSDL_PROGRESS_MONITOR"; //$NON-NLS-1$
-
-  /**
-   * Add this option with a value of Boolean.TRUE to the options map when
-   * loading a resource to instruct the loader to track source code location for
-   * each node in the source document.
-   * 
-   * @see WSDLParser#getUserData(org.w3c.dom.Node)
-   * @see WSDLParser#getStartColumn(org.w3c.dom.Node)
-   * @see WSDLParser#getEndColumn(org.w3c.dom.Node)
-   * @see WSDLParser#getStartLine(org.w3c.dom.Node)
-   * @see WSDLParser#getEndLine(org.w3c.dom.Node)
-   */
-  public static final String TRACK_LOCATION = "TRACK_LOCATION"; //$NON-NLS-1$
-
-  /**
-   * This option can be used as an option on Resource#load methods to specify JAXP pool to be used
-   * for loading and serializing XML Schemas.
-   * @see Resource#load(InputStream, Map)
-   * @see Resource#load(Map)
-   */
-  public static final String WSDL_JAXP_POOL = "WSDL_JAXP_POOL"; //$NON-NLS-1$
-  
-  /**
-   * This option can be used as an option on Resource#load methods to specify JAXP configuration
-   * that creates and configures SAX, DOM parsers and Transformer.
-   * @see Resource#load(InputStream, Map)
-   * @see Resource#load(Map)
-   */
-  public static final String WSDL_JAXP_CONFIG = "WSDL_JAXP_CONFIG"; //$NON-NLS-1$
-  
-  /**
-   * 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);
-    }
-  }
-
-  /**
-   * 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, String encoding)
-  {
-    try
-    {
-      Transformer transformer = new DefaultJAXPConfiguration().createTransformer(encoding);
-      // Be sure to use actual encoding of the transformer which might be non-null even if encoding started as null.
-      encoding = transformer.getOutputProperty(OutputKeys.ENCODING);
-      Writer writer = encoding == null ? new OutputStreamWriter(outputStream) : new OutputStreamWriter(outputStream, encoding);
-      transformer.transform(new DOMSource(document), new StreamResult(writer));
-    }
-    catch (Exception exception)
-    {
-      WSDLPlugin.INSTANCE.log(exception);
-    }
-  }
-  
-  private static void doSerialize(OutputStream outputStream, Document document, Map options) throws IOException
-  {
-    JAXPPool jaxpPool = null;
-    JAXPConfiguration config = null;
-    String encoding = null;
-    
-    if (options != null)
-    {
-      jaxpPool = (JAXPPool)options.get(WSDL_JAXP_POOL);
-      config = (JAXPConfiguration)options.get(WSDL_JAXP_CONFIG);
-      encoding = (String)options.get(WSDL_ENCODING);
-    }
-    
-    if (jaxpPool == null)
-    {
-      if (config == null)
-      {
-        doSerialize(outputStream, document, encoding);
-      }
-      else
-      {
-        try
-        {
-          Transformer transformer = config.createTransformer(encoding);
-          // Be sure to use actual encoding of the transformer which might be non-null even if encoding started as null.
-          encoding = transformer.getOutputProperty(OutputKeys.ENCODING);
-          Writer writer = encoding == null ? new OutputStreamWriter(outputStream) : new OutputStreamWriter(outputStream, encoding);
-          transformer.transform(new DOMSource(document), new StreamResult(writer));
-        }
-        catch (TransformerException exception)
-        {
-          WSDLPlugin.getPlugin().log(exception);
-        }
-      }
-    }
-    else
-    {
-      Transformer transformer = null;
-      try
-      {
-        transformer = jaxpPool.getTransformer(encoding);
-        Writer writer = encoding == null ? new OutputStreamWriter(outputStream) : new OutputStreamWriter(outputStream, encoding);
-        transformer.transform(new DOMSource(document), new StreamResult(writer));
-      }
-      catch (TransformerException exception)
-      {
-        WSDLPlugin.INSTANCE.log(exception);
-      }
-      finally
-      {
-        jaxpPool.releaseTransformer(transformer);
-      }
-    }
-  }
-
-  /**
-   * Loads a new {@link WSDLResourceImpl} into the resource set.
-   * @param inputSource the contents of the new resource.
-   * @param options any options to influence loading behavior.
-   */
-  protected void doLoad(InputSource inputSource, 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")); //$NON-NLS-1$
-      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
-    {
-      boolean trackLocation = options != null && Boolean.TRUE.equals(options.get(TRACK_LOCATION));
-
-      if (trackLocation)
-      {
-        doc = getDocumentUsingSAX(inputSource, options);
-      }
-      else
-      {
-        // Create a DOM document
-        doc = getDocument(inputSource, new InternalErrorHandler(), options);
-      }
-
-      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")); //$NON-NLS-1$
-        }
-      }
-      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();)
-        {
-          ExtensibilityElement extensibilityElement = (ExtensibilityElement)j.next();
-          if (!(extensibilityElement instanceof XSDSchemaExtensibilityElement))
-          {
-            continue;
-          }
-          
-          el = (XSDSchemaExtensibilityElement) extensibilityElement;
-          XSDSchema schema = el.getSchema();
-          if (schema != null)
-            schema.setSchemaLocation(getURI().toString());
-        }
-      }
-    }
-
-    if (progressMonitor != null)
-    {
-      progressMonitor.worked(1);
-    }
-  }
-
-  /**
-   * Loads a new {@link WSDLResourceImpl} into the resource set.
-   * @param inputStream the contents of the new resource.
-   * @param options any options to influence loading behavior.
-   */
-  protected void doLoad(InputStream inputStream, Map options) throws IOException
-  {
-    InputSource inputSource = inputStream instanceof URIConverter.ReadableInputStream ? new InputSource(
-      ((URIConverter.ReadableInputStream)inputStream).asReader()) : new InputSource(inputStream);
-
-    if (getURI() != null)
-    {
-      String id = getURI().toString();
-      inputSource.setPublicId(id);
-      inputSource.setSystemId(id);
-    }
-    doLoad(inputSource, options);
-  }
-
-  /**
-   * Use a custom SAX parser to allow us to track the source location of 
-   * each node in the source XML document.
-   * @param inputSource the parsing source. Must not be null.
-   * @param options the loading options. 
-   * @return the DOM document created by parsing the input stream. 
-   */
-  private Document getDocumentUsingSAX(InputSource inputSource, Map options)
-  {
-    WSDLParser wsdlParser = new WSDLParser(options);
-    wsdlParser.parse(inputSource);
-
-    Collection errors = wsdlParser.getDiagnostics();
-
-    if (errors != null)
-    {
-      Iterator iterator = errors.iterator();
-
-      while (iterator.hasNext())
-      {
-        WSDLDiagnostic wsdlDiagnostic = (WSDLDiagnostic)iterator.next();
-        switch (wsdlDiagnostic.getSeverity().getValue())
-        {
-          case WSDLDiagnosticSeverity.FATAL:
-          case WSDLDiagnosticSeverity.ERROR:
-          {
-            getErrors().add(wsdlDiagnostic);
-            break;
-          }
-          case WSDLDiagnosticSeverity.WARNING:
-          case WSDLDiagnosticSeverity.INFORMATION:
-          {
-            getWarnings().add(wsdlDiagnostic);
-            break;
-          }
-        }
-      }
-    }
-
-    Document doc = wsdlParser.getDocument();
-    
-    if (wsdlParser.getEncoding() != null)
-    {
-      getDefaultSaveOptions().put(WSDL_ENCODING, wsdlParser.getEncoding());
-    }
-    
-    return doc;
-  }
-
-  /**
-   * Builds a document using Xerces.
-   * @param inputSource the contents to parse.
-   * @param errorHandler the handled used by the parser.
-   * @return a document.
-   */
-  private static Document getDocument(InputSource inputSource, 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(inputSource);
-      return document;
-    }
-    catch (ParserConfigurationException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    catch (SAXException exception)
-    {
-      throw new IOWrappedException(exception);
-    }
-    finally
-    {
-      Thread.currentThread().setContextClassLoader(previousClassLoader);
-    }
-  }
-  
-  /**
-   * Builds DOM document using JAXP DocumentBuilder
-   * @see #WSDL_JAXP_POOL
-   * @see #WSDL_JAXP_CONFIG
-   * @param inputSource the content to parser
-   * @param errorHandler error handler for recording any loading errors
-   * @param options loading options
-   * @return document DOM document
-   * @throws IOException
-   */
-  private static Document getDocument(InputSource inputSource, ErrorHandler errorHandler, Map options) throws IOException
-  {
-    JAXPPool jaxpPool = null;
-    JAXPConfiguration config = null;
-    if (options != null)
-    {
-      jaxpPool = (JAXPPool)options.get(WSDL_JAXP_POOL);
-      config = (JAXPConfiguration)options.get(WSDL_JAXP_CONFIG);
-    }
-
-    if (jaxpPool == null)
-    {
-      if (config == null)
-      {
-        return getDocument(inputSource, errorHandler);
-      }
-      else
-      {
-        try
-        {
-          DocumentBuilder documentBuilder = config.createDocumentBuilder(errorHandler);
-          Document document = documentBuilder.parse(inputSource);
-          return document;
-        }
-        catch (ParserConfigurationException exception)
-        {
-          throw new IOWrappedException(exception);
-        }
-        catch (SAXException exception)
-        {
-          throw new IOWrappedException(exception);
-        }
-      }
-    }
-    else
-    {
-      DocumentBuilder documentBuilder = null;
-      try
-      {
-        documentBuilder = jaxpPool.getDocumentBuilder(errorHandler);
-        Document document = documentBuilder.parse(inputSource);
-        return document;
-      }
-      catch (ParserConfigurationException exception)
-      {
-        throw new IOWrappedException(exception);
-      }
-      catch (SAXException exception)
-      {
-        throw new IOWrappedException(exception);
-      }
-      finally
-      {
-        jaxpPool.releaseDocumentBuilder(documentBuilder);
-      }
-    }
-  }
-
-  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"); //$NON-NLS-1$
-      transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
-      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());
-   }  
-   }        
-   }      
-   }*/
-
-  public Map getDefaultSaveOptions()
-  {
-    if (defaultSaveOptions == null)
-    {
-      defaultSaveOptions = new HashMap();
-    }
-
-    return defaultSaveOptions;
-  }
-} //WSDLResourceFactoryImpl
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
deleted file mode 100644
index 344eb76..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
deleted file mode 100644
index f25a0e9..0000000
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>
-		The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>