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

27 files changed, 0 insertions, 8150 deletions

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 f4d9d1b15..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.soap.ISOAPAddress"
- * @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 602afe126..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.soap.ISOAPBinding"
- * @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 dfee7355b..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.soap.ISOAPBody"
- * @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 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 af0e365f4..000000000
--- 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 0aee7f96d..000000000
--- 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, 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.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" 
- *        eEncodingStylesDataType="org.eclipse.wst.wsdl.binding.soap.IString" eEncodingStylesMany="true" eEncodingStylesSuppressedGetVisibility="true" superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.soap.ISOAPFault"
- * @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 f8e656970..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase org.eclipse.wst.wsdl.binding.soap.ISOAPHeader"
- * @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 f6cf71d6a..000000000
--- 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, 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.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 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" type="org.eclipse.wst.wsdl.IList" many="false"
-   * @generated
-   */
-  List getEncodingStyles();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model encodingStylesType="org.eclipse.wst.wsdl.IList" 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 52e8cbdd3..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase org.eclipse.wst.wsdl.binding.soap.ISOAPHeaderFault"
- * @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 aca12be81..000000000
--- 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, 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.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 superTypes="org.eclipse.wst.wsdl.ExtensibilityElement org.eclipse.wst.wsdl.binding.soap.ISOAPOperation"
- * @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 3b73ab802..000000000
--- 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 6191903ff..000000000
--- 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 017a1ed44..000000000
--- 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 d48a4ecff..000000000
--- 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 e9a90781a..000000000
--- 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, 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.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;
-
-  /**
-   * 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;
-
-  /**
-   * 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;
-
-  /**
-   * <!-- 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 d9a2e9cd9..000000000
--- 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 85caaece9..000000000
--- 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, 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.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;
-
-  /**
-   * 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 3683ea36a..000000000
--- 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, 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.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;
-
-  /**
-   * 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;
-
-  /**
-   * The cached value of the '{@link #getEPart() <em>EPart</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEPart()
-   * @generated
-   * @ordered
-   */
-  protected Part ePart;
-
-  /**
-   * <!-- 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 7b4483033..000000000
--- 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 9815c678e..000000000
--- 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, 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.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;
-
-  /**
-   * <!-- 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 b87e3f87f..000000000
--- 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 a6a6dd4eb..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/internal/impl/SOAPPackageImpl.java
+++ /dev/null
@@ -1,896 +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
- *******************************************************************************/
-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;
-
-
-/**
- * <!-- 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();
-
-    // 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$
-
-    addEOperation(soapHeaderBaseEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1); //$NON-NLS-1$
-
-    EOperation 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$
-
-    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$
-
-    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$
-
-    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 2da729f80..000000000
--- 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, 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.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 that 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 766aa59c9..000000000
--- 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 8142b0476..000000000
--- 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 cca6ee6c7..000000000
--- 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, 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.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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 interpreting 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 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;
-  }
-
-} //SOAPSwitch
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
deleted file mode 100644
index 9554345e4..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="../../../../../..//apistyles.css" type="text/css">
-<title>WSDL Model SOAP Binding Extension API Overview</title>
-</head>
-<body>
-<p>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</p>
-<table width="500">
-<tr>
-<td>
-<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml b/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
deleted file mode 100644
index c2cb92a1c..000000000
--- a/bundles/org.eclipse.wst.wsdl/src-soap/org/eclipse/wst/wsdl/binding/soap/package.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
-	<head>
-		<meta
-			name="root"
-	
-			content="../../../../../../" />
-		<title>WSDL Model SOAP Binding Extension API Overview</title>
-	</head>
-
-	<body>
-		<abstract>
-        The WSDL model API allows clients to work with the WSDL 1.1 documents.
-		</abstract>
-		<p>The WSDL model API allows clients to load, modify, and save WSDL 1.1 documents.
-		</p> 
-	</body>
-</html>