[145413] [Model] NPE errors with WTP RC4 Genmodel creation. Corrected the nsURIs to use eclipse.org instead of ibm.com. Added dual registration in plugin.xml for the packages. Configured the genmodel to generate non-nls markers. Regenerated the code.
diff --git a/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore b/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore
index 6ee2fe8..45c4ab3 100644
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore
+++ b/bundles/org.eclipse.wst.wsdl/model/HTTP.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="http"
-    nsURI="http://www.ibm.com/wsdl/2003/HTTP" nsPrefix="http">
+    nsURI="http://www.eclipse.org/wsdl/2003/HTTP" nsPrefix="http">
   <eClassifiers xsi:type="ecore:EClass" name="HTTPBinding" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//IHTTPBinding">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="verb" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
diff --git a/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel b/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel
index 27477c3..2c26f9f 100644
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel
+++ b/bundles/org.eclipse.wst.wsdl/model/HTTP.genmodel
@@ -4,7 +4,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src-http"
     editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
     modelPluginID="org.eclipse.wst.wsdl" modelName="HTTP" editPluginClass="" editorPluginClass=""
-    codeFormatting="true" importerID="org.eclipse.emf.importer.rose" usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
+    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
+    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
   <foreignModel>HTTP.mdl</foreignModel>
   <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
   <foreignModel>../../..</foreignModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl b/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl
index f7ff467..50630fd 100644
--- a/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl
+++ b/bundles/org.eclipse.wst.wsdl/model/HTTP.mdl
@@ -61,7 +61,7 @@
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"nsURI"
-			value      	"http://www.ibm.com/wsdl/2003/HTTP")
+			value      	"http://www.eclipse.org/wsdl/2003/HTTP")
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"basePackage"
diff --git a/bundles/org.eclipse.wst.wsdl/model/MIME.ecore b/bundles/org.eclipse.wst.wsdl/model/MIME.ecore
index 84a3be8..ba8bb16 100644
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.ecore
+++ b/bundles/org.eclipse.wst.wsdl/model/MIME.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mime"
-    nsURI="http://www.ibm.com/wsdl/2003/MIME" nsPrefix="mime">
+    nsURI="http://www.eclipse.org/wsdl/2003/MIME" nsPrefix="mime">
   <eClassifiers xsi:type="ecore:EClass" name="MIMEContent" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//IMIMEContent">
     <eOperations name="setPart">
       <eParameters name="part" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel b/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel
index 9cc78be..02dfbef 100644
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel
+++ b/bundles/org.eclipse.wst.wsdl/model/MIME.genmodel
@@ -4,7 +4,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src-mime"
     editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
     modelPluginID="org.eclipse.wst.wsdl" modelName="MIME" editPluginClass="" editorPluginClass=""
-    codeFormatting="true" importerID="org.eclipse.emf.importer.rose" usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
+    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
+    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
   <foreignModel>MIME.mdl</foreignModel>
   <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
   <foreignModel>../../..</foreignModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/MIME.mdl b/bundles/org.eclipse.wst.wsdl/model/MIME.mdl
index db1b3f8..2d4945e 100644
--- a/bundles/org.eclipse.wst.wsdl/model/MIME.mdl
+++ b/bundles/org.eclipse.wst.wsdl/model/MIME.mdl
@@ -61,7 +61,7 @@
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"nsURI"
-			value      	"http://www.ibm.com/wsdl/2003/MIME")
+			value      	"http://www.eclipse.org/wsdl/2003/MIME")
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"basePackage"
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore b/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore
index debbb46..3621aab 100644
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore
+++ b/bundles/org.eclipse.wst.wsdl/model/SOAP.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="soap"
-    nsURI="http://www.ibm.com/wsdl/2003/SOAP" nsPrefix="soap">
+    nsURI="http://www.eclipse.org/wsdl/2003/SOAP" nsPrefix="soap">
   <eClassifiers xsi:type="ecore:EClass" name="SOAPBinding" eSuperTypes="WSDL.ecore#//ExtensibilityElement #//ISOAPBinding">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transportURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel b/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel
index 571f149..a8623ea 100644
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel
+++ b/bundles/org.eclipse.wst.wsdl/model/SOAP.genmodel
@@ -4,7 +4,8 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src-soap"
     editDirectory="/org.eclipse.wst.wsdl/src" editorDirectory="/org.eclipse.wst.wsdl/src"
     modelPluginID="org.eclipse.wst.wsdl" modelName="SOAP" editPluginClass="" editorPluginClass=""
-    codeFormatting="true" importerID="org.eclipse.emf.importer.rose" usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
+    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
+    usedGenPackages="WSDL.genmodel#//wsdl platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
   <foreignModel>SOAP.mdl</foreignModel>
   <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
   <foreignModel>../../..</foreignModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl b/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl
index d7be015..9c20f33 100644
--- a/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl
+++ b/bundles/org.eclipse.wst.wsdl/model/SOAP.mdl
@@ -66,7 +66,7 @@
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"nsURI"
-			value      	"http://www.ibm.com/wsdl/2003/SOAP")
+			value      	"http://www.eclipse.org/wsdl/2003/SOAP")
 		    (object Attribute
 			tool       	"Ecore"
 			name       	"basePackage"
diff --git a/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore b/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore
index 165c132..fa66904 100644
--- a/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore
+++ b/bundles/org.eclipse.wst.wsdl/model/WSDL.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="wsdl"
-    nsURI="http://www.ibm.com/wsdl/2003/WSDL" nsPrefix="wsdl">
+    nsURI="http://www.eclipse.org/wsdl/2003/WSDL" nsPrefix="wsdl">
   <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
     <details key="documentation" value="The WSDL model contains classes for the Web Services Description Language (WSDL).&#xD;&#xA;&#xD;&#xA;WSDL describes network services as sets of endpoints operating on messages. The operations and messages are described abstractly, and then bound to a concrete network protocol and message format to define an endpoint.&#xD;&#xA;&#xD;&#xA;WSDL describes the formats of the messages exchanged by the services, and supports the XML Schemas specification as its canonical type system. This package uses an XML Schema Infoset model package (see the XSD package) to describe the abstract message formats.&#xD;&#xA;&#xD;&#xA;The model contains the following diagrams, named after the corresponding chapters in the WSDL 1.1 specification (http://www.w3.org/TR/2001/NOTE-wsdl-20010315)&#xD;&#xA;- 2.1 Definition, shows the WSDL definition element and the WSDL document structure&#xD;&#xA;- 2.1.1 Naming and Linking, shows the namespace and import mechanism&#xD;&#xA;- 2.1.3 Extensibility, shows the WSDL extensibility mechanism&#xD;&#xA;- 2.2 Types, shows the use of XML Schema types in WSDL&#xD;&#xA;- 2.3 Messages, 2.4 PortTypes, 2.5 Bindings and 2.7 Services, show the major WSDL elements and their relations.&#xD;&#xA;&#xD;&#xA;The WSDL classes extend the javax.wsdl interfaces defined by JSR 110. Classes with interface and datatype stereotypes are used to represent these non-MOF interfaces."/>
   </eAnnotations>
diff --git a/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel b/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel
index 0d45fe8..b0961e6 100644
--- a/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel
+++ b/bundles/org.eclipse.wst.wsdl/model/WSDL.genmodel
@@ -4,7 +4,7 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.wst.wsdl/src-wsdl"
     editDirectory="/org.eclipse.wst.wsdl.edit/src" editorDirectory="org.eclipse.wst.wsdl.editor/src"
     modelPluginID="org.eclipse.wst.wsdl" modelName="WSDL" modelPluginClass="" editPluginClass=""
-    editorPluginClass="" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
+    editorPluginClass="" nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.rose"
     usedGenPackages="platform:/plugin/org.eclipse.xsd/model/XSD.genmodel#//xsd">
   <foreignModel>WSDL.mdl</foreignModel>
   <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
diff --git a/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat b/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat
index b353f8b..78b72ca 100644
--- a/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat
+++ b/bundles/org.eclipse.wst.wsdl/model/org.eclipse.wst.WSDL.cat
@@ -15,7 +15,7 @@
 	(object Attribute
 	    tool       	"Ecore"
 	    name       	"nsURI"
-	    value      	"http://www.ibm.com/wsdl/2003/WSDL")
+	    value      	"http://www.eclipse.org/wsdl/2003/WSDL")
 	(object Attribute
 	    tool       	"Ecore"
 	    name       	"basePackage"
diff --git a/bundles/org.eclipse.wst.wsdl/plugin.xml b/bundles/org.eclipse.wst.wsdl/plugin.xml
index 89458bd..737f7c2 100644
--- a/bundles/org.eclipse.wst.wsdl/plugin.xml
+++ b/bundles/org.eclipse.wst.wsdl/plugin.xml
@@ -15,9 +15,24 @@
 		<package
         class="org.eclipse.wst.wsdl.WSDLPackage"
         genModel="model/WSDL.genmodel"
+        uri="http://www.eclipse.org/wsdl/2003/WSDL">
+		</package>
+	</extension>
+
+	<!-- 
+		This extension is duplicated here to provide for backward compatibility.
+		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/WSDL to
+		http://www.eclipse.org/wsdl/2003/WSDL. 
+	 -->
+
+	<extension point="org.eclipse.emf.ecore.generated_package">
+		<package
+        class="org.eclipse.wst.wsdl.WSDLPackage"
+        genModel="model/WSDL.genmodel"
         uri="http://www.ibm.com/wsdl/2003/WSDL">
 		</package>
 	</extension>
+
 	<extension point="org.eclipse.emf.ecore.extension_parser">
 		<parser
 			type="wsdl"
@@ -33,6 +48,20 @@
 		</package>
 	</extension>
 
+	<!-- 
+		This extension is duplicated here to provide for backward compatibility.
+		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/HTTP to
+		http://www.eclipse.org/wsdl/2003/HTTP. 
+	 -->
+
+	<extension point="org.eclipse.emf.ecore.generated_package">
+		<package
+			uri="http://www.ibm.com/wsdl/2003/HTTP"
+	        genModel="model/HTTP.genmodel"
+			class="org.eclipse.wst.wsdl.binding.http.HTTPPackage">
+		</package>
+	</extension>
+
 	<extension
 		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
 		<extensibilityElementFactory
@@ -48,6 +77,20 @@
 		</package>
 	</extension>
 
+	<!-- 
+		This extension is duplicated here to provide for backward compatibility.
+		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/MIME to
+		http://www.eclipse.org/wsdl/2003/MIME. 
+	 -->
+
+	<extension point="org.eclipse.emf.ecore.generated_package">
+		<package
+			uri="http://www.ibm.com/wsdl/2003/MIME"
+	        genModel="model/MIME.genmodel"
+			class="org.eclipse.wst.wsdl.binding.mime.MIMEPackage">
+		</package>
+	</extension>
+
 	<extension
 		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
 		<extensibilityElementFactory
@@ -63,6 +106,20 @@
 		</package>
 	</extension>
 
+	<!-- 
+		This extension is duplicated here to provide for backward compatibility.
+		The namespace URI was renamed from http://www.ibm.com/wsdl/2003/SOAP to
+		http://www.eclipse.org/wsdl/2003/SOAP. 
+	 -->
+
+	<extension point="org.eclipse.emf.ecore.generated_package">
+		<package
+			uri="http://www.ibm.com/wsdl/2003/SOAP"
+	        genModel="model/SOAP.genmodel"
+			class="org.eclipse.wst.wsdl.binding.soap.SOAPPackage">
+		</package>
+	</extension>
+
 	<extension
 		point="org.eclipse.wst.wsdl.extensibilityElementFactories">
 		<extensibilityElementFactory
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
index 39f909c..8174fd6 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/HTTPPackage.java
@@ -48,7 +48,7 @@
    * <!-- end-user-doc -->
    * @generated
    */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/HTTP";
+  String eNS_URI = "http://www.eclipse.org/wsdl/2003/HTTP";
 
   /**
    * The package namespace name.
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
index 7bba71c..4424dc6 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPAddressImpl.java
@@ -182,7 +182,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: ");
+    result.append(" (locationURI: "); //$NON-NLS-1$
     result.append(locationURI);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
index 120711b..eae3317 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPBindingImpl.java
@@ -182,7 +182,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (verb: ");
+    result.append(" (verb: "); //$NON-NLS-1$
     result.append(verb);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
index d0ff41e..e827d39 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPFactoryImpl.java
@@ -16,13 +16,7 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPFactory;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
+import org.eclipse.wst.wsdl.binding.http.*;
 
 
 /**
@@ -43,7 +37,7 @@
   {
     try
     {
-      HTTPFactory theHTTPFactory = (HTTPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.ibm.com/wsdl/2003/HTTP");
+      HTTPFactory theHTTPFactory = (HTTPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/HTTP"); //$NON-NLS-1$ 
       if (theHTTPFactory != null)
       {
         return theHTTPFactory;
@@ -87,7 +81,7 @@
       case HTTPPackage.HTTP_ADDRESS:
       return createHTTPAddress();
       default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
index e4d80a7..16a8caf 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPOperationImpl.java
@@ -182,7 +182,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: ");
+    result.append(" (locationURI: "); //$NON-NLS-1$
     result.append(locationURI);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
index d718523..3bf6a1d 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/impl/HTTPPackageImpl.java
@@ -406,109 +406,55 @@
     httpAddressEClass.getESuperTypes().add(this.getIHTTPAddress());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(httpBindingEClass, HTTPBinding.class, "HTTPBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(httpBindingEClass, HTTPBinding.class, "HTTPBinding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getHTTPBinding_Verb(),
       ecorePackage.getEString(),
-      "verb",
-      null,
-      0,
-      1,
-      HTTPBinding.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "verb", null, 0, 1, HTTPBinding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(httpOperationEClass, HTTPOperation.class, "HTTPOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(httpOperationEClass, HTTPOperation.class, "HTTPOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getHTTPOperation_LocationURI(),
       ecorePackage.getEString(),
-      "locationURI",
-      null,
-      0,
-      1,
-      HTTPOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "locationURI", null, 0, 1, HTTPOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(
       httpUrlReplacementEClass,
       HTTPUrlReplacement.class,
-      "HTTPUrlReplacement",
-      !IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "HTTPUrlReplacement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(httpUrlEncodedEClass, HTTPUrlEncoded.class, "HTTPUrlEncoded", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(httpUrlEncodedEClass, HTTPUrlEncoded.class, "HTTPUrlEncoded", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(httpAddressEClass, HTTPAddress.class, "HTTPAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(httpAddressEClass, HTTPAddress.class, "HTTPAddress", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getHTTPAddress_LocationURI(),
       ecorePackage.getEString(),
-      "locationURI",
-      null,
-      0,
-      1,
-      HTTPAddress.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "locationURI", null, 0, 1, HTTPAddress.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(
       ihttpAddressEClass,
       javax.wsdl.extensions.http.HTTPAddress.class,
-      "IHTTPAddress",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IHTTPAddress", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       ihttpBindingEClass,
       javax.wsdl.extensions.http.HTTPBinding.class,
-      "IHTTPBinding",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IHTTPBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       ihttpOperationEClass,
       javax.wsdl.extensions.http.HTTPOperation.class,
-      "IHTTPOperation",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IHTTPOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       ihttpUrlEncodedEClass,
       javax.wsdl.extensions.http.HTTPUrlEncoded.class,
-      "IHTTPUrlEncoded",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IHTTPUrlEncoded", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       ihttpUrlReplacementEClass,
       javax.wsdl.extensions.http.HTTPUrlReplacement.class,
-      "IHTTPUrlReplacement",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IHTTPUrlReplacement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Create resource
     createResource(eNS_URI);
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
index 8566939..cbc02df 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPAdapterFactory.java
@@ -18,12 +18,7 @@
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
+import org.eclipse.wst.wsdl.binding.http.*;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
index 00f7a20..18a1ff3 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPConstants.java
@@ -16,21 +16,21 @@
 
 public final class HTTPConstants
 {
-  public static final String ADDRESS_ELEMENT_TAG = "address";
+  public static final String ADDRESS_ELEMENT_TAG = "address"; //$NON-NLS-1$
 
-  public static final String BINDING_ELEMENT_TAG = "binding";
+  public static final String BINDING_ELEMENT_TAG = "binding"; //$NON-NLS-1$
 
-  public static final String OPERATION_ELEMENT_TAG = "operation";
+  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
 
-  public static final String URL_ENCODED_ELEMENT_TAG = "urlEncoded";
+  public static final String URL_ENCODED_ELEMENT_TAG = "urlEncoded"; //$NON-NLS-1$
 
-  public static final String URL_REPLACEMENT_ELEMENT_TAG = "urlReplacement";
+  public static final String URL_REPLACEMENT_ELEMENT_TAG = "urlReplacement"; //$NON-NLS-1$
 
-  public static final String HTTP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/http/";
+  public static final String HTTP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/http/"; //$NON-NLS-1$
 
-  public static final String LOCATION_URI_ATTRIBUTE = "location";
+  public static final String LOCATION_URI_ATTRIBUTE = "location"; //$NON-NLS-1$
 
-  public static final String VERB_ATTRIBUTE = "verb";
+  public static final String VERB_ATTRIBUTE = "verb"; //$NON-NLS-1$
 
   public static String getAttribute(Element element, String attributeName)
   {
diff --git a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
index cfa0c15..9c1de18 100644
--- a/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
+++ b/bundles/org.eclipse.wst.wsdl/src-http/org/eclipse/wst/wsdl/binding/http/internal/util/HTTPSwitch.java
@@ -18,12 +18,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.http.HTTPAddress;
-import org.eclipse.wst.wsdl.binding.http.HTTPBinding;
-import org.eclipse.wst.wsdl.binding.http.HTTPOperation;
-import org.eclipse.wst.wsdl.binding.http.HTTPPackage;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlEncoded;
-import org.eclipse.wst.wsdl.binding.http.HTTPUrlReplacement;
+import org.eclipse.wst.wsdl.binding.http.*;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
index 2afc7d4..d7ca0e7 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/MIMEPackage.java
@@ -50,7 +50,7 @@
    * <!-- end-user-doc -->
    * @generated
    */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/MIME";
+  String eNS_URI = "http://www.eclipse.org/wsdl/2003/MIME";
 
   /**
    * The package namespace name.
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
index ebacde4..9069423 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEContentImpl.java
@@ -272,7 +272,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (type: ");
+    result.append(" (type: "); //$NON-NLS-1$
     result.append(type);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
index 3fb0e26..e51bcad 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEFactoryImpl.java
@@ -19,12 +19,7 @@
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEFactory;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
+import org.eclipse.wst.wsdl.binding.mime.*;
 
 
 /**
@@ -45,7 +40,7 @@
   {
     try
     {
-      MIMEFactory theMIMEFactory = (MIMEFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.ibm.com/wsdl/2003/MIME");
+      MIMEFactory theMIMEFactory = (MIMEFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/MIME"); //$NON-NLS-1$ 
       if (theMIMEFactory != null)
       {
         return theMIMEFactory;
@@ -87,7 +82,7 @@
       case MIMEPackage.MIME_MIME_XML:
       return createMIMEMimeXml();
       default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -103,7 +98,7 @@
       case MIMEPackage.LIST:
       return createListFromString(eDataType, initialValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -119,7 +114,7 @@
       case MIMEPackage.LIST:
       return convertListToString(eDataType, instanceValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
index 99ec1e1..0940f35 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/impl/MIMEPackageImpl.java
@@ -401,144 +401,78 @@
     mimeMimeXmlEClass.getESuperTypes().add(this.getIMIMEMimeXml());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(mimeContentEClass, MIMEContent.class, "MIMEContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(mimeContentEClass, MIMEContent.class, "MIMEContent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getMIMEContent_Type(),
       ecorePackage.getEString(),
-      "type",
-      null,
-      0,
-      1,
-      MIMEContent.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "type", null, 0, 1, MIMEContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getMIMEContent_EPart(),
       theWSDLPackage.getPart(),
       null,
-      "ePart",
-      null,
-      0,
-      1,
-      MIMEContent.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "ePart", null, 0, 1, MIMEContent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    EOperation op = addEOperation(mimeContentEClass, null, "setPart");
-    addEParameter(op, ecorePackage.getEString(), "part", 0, 1);
+    EOperation op = addEOperation(mimeContentEClass, null, "setPart"); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "part", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(mimeContentEClass, ecorePackage.getEString(), "getPart", 0, 1);
+    op = addEOperation(mimeContentEClass, ecorePackage.getEString(), "getPart", 0, 1); //$NON-NLS-1$
 
-    initEClass(mimePartEClass, MIMEPart.class, "MIMEPart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(mimePartEClass, MIMEPart.class, "MIMEPart", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(mimePartEClass, null, "addExtensibilityElement");
-    addEParameter(op, theWSDLPackage.getIExtensibilityElement(), "extensibilityElement", 0, 1);
+    op = addEOperation(mimePartEClass, null, "addExtensibilityElement"); //$NON-NLS-1$
+    addEParameter(op, theWSDLPackage.getIExtensibilityElement(), "extensibilityElement", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(mimePartEClass, this.getList(), "getExtensibilityElements", 0, 1);
+    op = addEOperation(mimePartEClass, this.getList(), "getExtensibilityElements", 0, 1); //$NON-NLS-1$
 
     initEClass(
       mimeMultipartRelatedEClass,
       MIMEMultipartRelated.class,
-      "MIMEMultipartRelated",
-      !IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "MIMEMultipartRelated", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
       getMIMEMultipartRelated_EMIMEPart(),
       this.getMIMEPart(),
       null,
-      "eMIMEPart",
-      null,
-      0,
-      -1,
-      MIMEMultipartRelated.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eMIMEPart", null, 0, -1, MIMEMultipartRelated.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(mimeMultipartRelatedEClass, null, "addMIMEPart");
-    addEParameter(op, this.getIMIMEPart(), "mimePart", 0, 1);
+    op = addEOperation(mimeMultipartRelatedEClass, null, "addMIMEPart"); //$NON-NLS-1$
+    addEParameter(op, this.getIMIMEPart(), "mimePart", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(mimeMultipartRelatedEClass, this.getList(), "getMIMEParts", 0, 1);
+    op = addEOperation(mimeMultipartRelatedEClass, this.getList(), "getMIMEParts", 0, 1); //$NON-NLS-1$
 
-    initEClass(mimeMimeXmlEClass, MIMEMimeXml.class, "MIMEMimeXml", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(mimeMimeXmlEClass, MIMEMimeXml.class, "MIMEMimeXml", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
       getMIMEMimeXml_EPart(),
       theWSDLPackage.getPart(),
       null,
-      "ePart",
-      null,
-      0,
-      1,
-      MIMEMimeXml.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "ePart", null, 0, 1, MIMEMimeXml.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(mimeMimeXmlEClass, null, "setPart");
-    addEParameter(op, ecorePackage.getEString(), "part", 0, 1);
+    op = addEOperation(mimeMimeXmlEClass, null, "setPart"); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "part", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(mimeMimeXmlEClass, ecorePackage.getEString(), "getPart", 0, 1);
+    op = addEOperation(mimeMimeXmlEClass, ecorePackage.getEString(), "getPart", 0, 1); //$NON-NLS-1$
 
     initEClass(
       imimePartEClass,
       javax.wsdl.extensions.mime.MIMEPart.class,
-      "IMIMEPart",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IMIMEPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       imimeMultipartRelatedEClass,
       javax.wsdl.extensions.mime.MIMEMultipartRelated.class,
-      "IMIMEMultipartRelated",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IMIMEMultipartRelated", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       imimeContentEClass,
       javax.wsdl.extensions.mime.MIMEContent.class,
-      "IMIMEContent",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IMIMEContent", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       imimeMimeXmlEClass,
       javax.wsdl.extensions.mime.MIMEMimeXml.class,
-      "IMIMEMimeXml",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IMIMEMimeXml", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Initialize data types
-    initEDataType(listEDataType, List.class, "List", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(listEDataType, List.class, "List", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Create resource
     createResource(eNS_URI);
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
index 10acc29..4c8e4e8 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEAdapterFactory.java
@@ -18,11 +18,7 @@
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
+import org.eclipse.wst.wsdl.binding.mime.*;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
index abac588..5463278 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMEConstants.java
@@ -16,19 +16,19 @@
 
 public final class MIMEConstants
 {
-  public static final String CONTENT_ELEMENT_TAG = "content";
+  public static final String CONTENT_ELEMENT_TAG = "content"; //$NON-NLS-1$
 
-  public static final String MIME_XML_ELEMENT_TAG = "mimeXml";
+  public static final String MIME_XML_ELEMENT_TAG = "mimeXml"; //$NON-NLS-1$
 
-  public static final String MULTIPART_RELATED_ELEMENT_TAG = "multipartRelated";
+  public static final String MULTIPART_RELATED_ELEMENT_TAG = "multipartRelated"; //$NON-NLS-1$
 
-  public static final String PART_ELEMENT_TAG = "part";
+  public static final String PART_ELEMENT_TAG = "part"; //$NON-NLS-1$
 
-  public static final String MIME_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/mime/";
+  public static final String MIME_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/mime/"; //$NON-NLS-1$
 
-  public static final String PART_ATTRIBUTE = "part";
+  public static final String PART_ATTRIBUTE = "part"; //$NON-NLS-1$
 
-  public static final String TYPE_ATTRIBUTE = "type";
+  public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
 
   public static String getAttribute(Element element, String attributeName)
   {
diff --git a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
index 4663c16..7568751 100644
--- a/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
+++ b/bundles/org.eclipse.wst.wsdl/src-mime/org/eclipse/wst/wsdl/binding/mime/internal/util/MIMESwitch.java
@@ -18,11 +18,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.mime.MIMEContent;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMimeXml;
-import org.eclipse.wst.wsdl.binding.mime.MIMEMultipartRelated;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPackage;
-import org.eclipse.wst.wsdl.binding.mime.MIMEPart;
+import org.eclipse.wst.wsdl.binding.mime.*;
 
 
 /**
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
index 5c95908..55b20ff 100644
--- 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
@@ -50,7 +50,7 @@
    * <!-- end-user-doc -->
    * @generated
    */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/SOAP";
+  String eNS_URI = "http://www.eclipse.org/wsdl/2003/SOAP";
 
   /**
    * The package namespace name.
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
index 74b1796..552589a 100644
--- 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
@@ -182,7 +182,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (locationURI: ");
+    result.append(" (locationURI: "); //$NON-NLS-1$
     result.append(locationURI);
     result.append(')');
     return result.toString();
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
index eec545a..1dabcb4 100644
--- 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
@@ -236,9 +236,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (transportURI: ");
+    result.append(" (transportURI: "); //$NON-NLS-1$
     result.append(transportURI);
-    result.append(", style: ");
+    result.append(", style: "); //$NON-NLS-1$
     result.append(style);
     result.append(')');
     return result.toString();
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
index 421355d..73d6580 100644
--- 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
@@ -384,11 +384,11 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
+    result.append(" (use: "); //$NON-NLS-1$
     result.append(use);
-    result.append(", namespaceURI: ");
+    result.append(", namespaceURI: "); //$NON-NLS-1$
     result.append(namespaceURI);
-    result.append(", eEncodingStyles: ");
+    result.append(", eEncodingStyles: "); //$NON-NLS-1$
     result.append(eEncodingStyles);
     result.append(')');
     return result.toString();
@@ -413,7 +413,7 @@
     {
       getEncodingStyles().clear();
     }
-   
+
     reconcileReferences(false);
   }
 
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
index e72cbc0..d9a2e9c 100644
--- 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
@@ -17,16 +17,7 @@
 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.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFactory;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
+import org.eclipse.wst.wsdl.binding.soap.*;
 
 
 /**
@@ -47,7 +38,7 @@
   {
     try
     {
-      SOAPFactory theSOAPFactory = (SOAPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.ibm.com/wsdl/2003/SOAP");
+      SOAPFactory theSOAPFactory = (SOAPFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/SOAP"); //$NON-NLS-1$ 
       if (theSOAPFactory != null)
       {
         return theSOAPFactory;
@@ -97,7 +88,7 @@
       case SOAPPackage.SOAP_HEADER:
       return createSOAPHeader();
       default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -113,7 +104,7 @@
       case SOAPPackage.ISTRING:
       return createIStringFromString(eDataType, initialValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -129,7 +120,7 @@
       case SOAPPackage.ISTRING:
       return convertIStringToString(eDataType, instanceValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
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
index 6788de3..d736f68 100644
--- 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
@@ -346,13 +346,13 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
+    result.append(" (use: "); //$NON-NLS-1$
     result.append(use);
-    result.append(", namespaceURI: ");
+    result.append(", namespaceURI: "); //$NON-NLS-1$
     result.append(namespaceURI);
-    result.append(", eEncodingStyles: ");
+    result.append(", eEncodingStyles: "); //$NON-NLS-1$
     result.append(eEncodingStyles);
-    result.append(", name: ");
+    result.append(", name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
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
index 03744f7..1743d90 100644
--- 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
@@ -538,15 +538,15 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (use: ");
+    result.append(" (use: "); //$NON-NLS-1$
     result.append(use);
-    result.append(", namespaceURI: ");
+    result.append(", namespaceURI: "); //$NON-NLS-1$
     result.append(namespaceURI);
-    result.append(", eEncodingStyles: ");
+    result.append(", eEncodingStyles: "); //$NON-NLS-1$
     result.append(eEncodingStyles);
-    result.append(", message: ");
+    result.append(", message: "); //$NON-NLS-1$
     result.append(message);
-    result.append(", part: ");
+    result.append(", part: "); //$NON-NLS-1$
     result.append(part);
     result.append(')');
     return result.toString();
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
index 35ff33f..44bc5b8 100644
--- 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
@@ -236,9 +236,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (soapActionURI: ");
+    result.append(" (soapActionURI: "); //$NON-NLS-1$
     result.append(soapActionURI);
-    result.append(", style: ");
+    result.append(", style: "); //$NON-NLS-1$
     result.append(style);
     result.append(')');
     return result.toString();
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
index d10014d..3f6fb52 100644
--- 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
@@ -730,444 +730,167 @@
     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);
+    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);
+      "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);
+      "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);
+    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);
+      "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);
+      "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);
+      "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);
+      "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);
+    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);
+      "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);
+      "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);
+      "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);
+      "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);
+      "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);
+      "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);
+      "ePart", null, 1, 1, SOAPHeaderBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    EOperation op = addEOperation(soapHeaderBaseEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1);
+    EOperation op = addEOperation(soapHeaderBaseEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(soapHeaderBaseEClass, null, "setEncodingStyles");
-    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1);
+    op = addEOperation(soapHeaderBaseEClass, null, "setEncodingStyles"); //$NON-NLS-1$
+    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1); //$NON-NLS-1$
 
-    initEClass(soapFaultEClass, SOAPFault.class, "SOAPFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    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);
+      "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);
+      "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);
+      "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);
+      "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);
+    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);
+      "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);
+      "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);
+    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);
+      "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);
+    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);
+    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);
+      "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);
+      "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);
+      "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);
+      "ISOAPBody", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1);
+    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getEncodingStyles", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(isoapBodyEClass, null, "setEncodingStyles");
-    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1);
+    op = addEOperation(isoapBodyEClass, null, "setEncodingStyles"); //$NON-NLS-1$
+    addEParameter(op, theWSDLPackage.getIList(), "encodingStyles", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getParts", 0, 1);
+    op = addEOperation(isoapBodyEClass, theWSDLPackage.getIList(), "getParts", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(isoapBodyEClass, null, "setParts");
-    addEParameter(op, theWSDLPackage.getIList(), "parts", 0, 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);
+      "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);
+      "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);
+      "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);
+      "ISOAPHeader", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(isoapHeaderEClass, theWSDLPackage.getIList(), "getSOAPHeaderFaults", 0, 1);
+    op = addEOperation(isoapHeaderEClass, theWSDLPackage.getIList(), "getSOAPHeaderFaults", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(isoapHeaderEClass, null, "addSOAPHeaderFault");
-    addEParameter(op, this.getISOAPHeaderFault(), "soapHeaderFault", 0, 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);
+    initEDataType(iStringEDataType, String.class, "IString", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Create resource
     createResource(eNS_URI);
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
index 36031b9..55ab860 100644
--- 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
@@ -18,15 +18,7 @@
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
+import org.eclipse.wst.wsdl.binding.soap.*;
 
 
 /**
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
index 0267d5a..766aa59 100644
--- 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
@@ -16,45 +16,45 @@
 
 public final class SOAPConstants
 {
-  public static final String ADDRESS_ELEMENT_TAG = "address";
+  public static final String ADDRESS_ELEMENT_TAG = "address"; //$NON-NLS-1$
 
-  public static final String BINDING_ELEMENT_TAG = "binding";
+  public static final String BINDING_ELEMENT_TAG = "binding"; //$NON-NLS-1$
 
-  public static final String BODY_ELEMENT_TAG = "body";
+  public static final String BODY_ELEMENT_TAG = "body"; //$NON-NLS-1$
 
-  public static final String FAULT_ELEMENT_TAG = "fault";
+  public static final String FAULT_ELEMENT_TAG = "fault"; //$NON-NLS-1$
 
-  public static final String HEADER_ELEMENT_TAG = "header";
+  public static final String HEADER_ELEMENT_TAG = "header"; //$NON-NLS-1$
 
-  public static final String HEADER_FAULT_ELEMENT_TAG = "headerfault";
+  public static final String HEADER_FAULT_ELEMENT_TAG = "headerfault"; //$NON-NLS-1$
 
-  public static final String OPERATION_ELEMENT_TAG = "operation";
+  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
 
-  public static final String SOAP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/soap/";
+  public static final String SOAP_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/soap/"; //$NON-NLS-1$
 
-  public static final String SOAP_ACTION_ATTRIBUTE = "soapAction";
+  public static final String SOAP_ACTION_ATTRIBUTE = "soapAction"; //$NON-NLS-1$
 
-  public static final String STYLE_ATTRIBUTE = "style";
+  public static final String STYLE_ATTRIBUTE = "style"; //$NON-NLS-1$
 
-  public static final String LOCATION_ATTRIBUTE = "location";
+  public static final String LOCATION_ATTRIBUTE = "location"; //$NON-NLS-1$
 
-  public static final String TRANSPORT_ATTRIBUTE = "transport";
+  public static final String TRANSPORT_ATTRIBUTE = "transport"; //$NON-NLS-1$
 
-  public static final String USE_ATTRIBUTE = "use";
+  public static final String USE_ATTRIBUTE = "use"; //$NON-NLS-1$
 
-  public static final String NAMESPACE_ATTRIBUTE = "namespace";
+  public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
 
-  public static final String NAMESPACE_URI_ATTRIBUTE = "namespaceURI";
+  public static final String NAMESPACE_URI_ATTRIBUTE = "namespaceURI"; //$NON-NLS-1$
 
-  public static final String NAME_ATTRIBUTE = "name";
+  public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
 
-  public static final String ENCODING_STYLE_ATTRIBUTE = "encodingStyle";
+  public static final String ENCODING_STYLE_ATTRIBUTE = "encodingStyle"; //$NON-NLS-1$
 
-  public static final String MESSAGE_ATTRIBUTE = "message";
+  public static final String MESSAGE_ATTRIBUTE = "message"; //$NON-NLS-1$
 
-  public static final String PART_ATTRIBUTE = "part";
+  public static final String PART_ATTRIBUTE = "part"; //$NON-NLS-1$
 
-  public static final String PARTS_ATTRIBUTE = "parts";
+  public static final String PARTS_ATTRIBUTE = "parts"; //$NON-NLS-1$
 
   public static String getAttribute(Element element, String attributeName)
   {
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
index 5d1f8bd..6548744 100644
--- 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
@@ -18,15 +18,7 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.SOAPAddress;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBinding;
-import org.eclipse.wst.wsdl.binding.soap.SOAPBody;
-import org.eclipse.wst.wsdl.binding.soap.SOAPFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeader;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderBase;
-import org.eclipse.wst.wsdl.binding.soap.SOAPHeaderFault;
-import org.eclipse.wst.wsdl.binding.soap.SOAPOperation;
-import org.eclipse.wst.wsdl.binding.soap.SOAPPackage;
+import org.eclipse.wst.wsdl.binding.soap.*;
 
 
 /**
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
index 34615b8..2617e12 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/WSDLPackage.java
@@ -73,7 +73,7 @@
    * <!-- end-user-doc -->
    * @generated
    */
-  String eNS_URI = "http://www.ibm.com/wsdl/2003/WSDL";
+  String eNS_URI = "http://www.eclipse.org/wsdl/2003/WSDL";
 
   /**
    * The package namespace name.
@@ -932,15 +932,6 @@
   int DEFINITION__ENCODING = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 3;
 
   /**
-   * The feature id for the '<em><b>ENamespaces</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DEFINITION__ENAMESPACES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
-
-  /**
    * The feature id for the '<em><b>EImports</b></em>' containment reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -995,6 +986,15 @@
   int DEFINITION__ESERVICES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 9;
 
   /**
+   * The feature id for the '<em><b>ENamespaces</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFINITION__ENAMESPACES = EXTENSIBLE_ELEMENT_FEATURE_COUNT + 10;
+
+  /**
    * The number of structural features of the '<em>Definition</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
index 89ee38d..eb11cb4 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingFaultImpl.java
@@ -275,7 +275,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
index de05e79..2818e97 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingImpl.java
@@ -479,9 +479,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
+    result.append(" (qName: "); //$NON-NLS-1$
     result.append(qName);
-    result.append(", undefined: ");
+    result.append(", undefined: "); //$NON-NLS-1$
     result.append(undefined);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
index 2336b8c..c9fde3d 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingInputImpl.java
@@ -275,7 +275,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
index 2de9d5d..f364894 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOperationImpl.java
@@ -615,7 +615,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
index 710f69a..f8393f1 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/BindingOutputImpl.java
@@ -275,7 +275,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
index dc0e915..149e656 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/DefinitionImpl.java
@@ -198,16 +198,6 @@
   protected String encoding = ENCODING_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getENamespaces() <em>ENamespaces</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getENamespaces()
-   * @generated
-   * @ordered
-   */
-  protected EList eNamespaces = null;
-
-  /**
    * The cached value of the '{@link #getEImports() <em>EImports</em>}' containment reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -267,6 +257,16 @@
    */
   protected EList eServices = null;
 
+  /**
+   * The cached value of the '{@link #getENamespaces() <em>ENamespaces</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getENamespaces()
+   * @generated
+   * @ordered
+   */
+  protected EList eNamespaces = null;
+
   private ExtensionRegistry extensionRegistry;
 
   private Document document;
@@ -1431,13 +1431,13 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (targetNamespace: ");
+    result.append(" (targetNamespace: "); //$NON-NLS-1$
     result.append(targetNamespace);
-    result.append(", location: ");
+    result.append(", location: "); //$NON-NLS-1$
     result.append(location);
-    result.append(", qName: ");
+    result.append(", qName: "); //$NON-NLS-1$
     result.append(qName);
-    result.append(", encoding: ");
+    result.append(", encoding: "); //$NON-NLS-1$
     result.append(encoding);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
index e84e00d..ea73ff2 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ExtensibilityElementImpl.java
@@ -244,9 +244,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (required: ");
+    result.append(" (required: "); //$NON-NLS-1$
     result.append(required);
-    result.append(", elementType: ");
+    result.append(", elementType: "); //$NON-NLS-1$
     result.append(elementType);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
index a98e4dc..1a6d67d 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ImportImpl.java
@@ -401,9 +401,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (namespaceURI: ");
+    result.append(" (namespaceURI: "); //$NON-NLS-1$
     result.append(namespaceURI);
-    result.append(", locationURI: ");
+    result.append(", locationURI: "); //$NON-NLS-1$
     result.append(locationURI);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
index 2471518..e609314 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageImpl.java
@@ -381,9 +381,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
+    result.append(" (qName: "); //$NON-NLS-1$
     result.append(qName);
-    result.append(", undefined: ");
+    result.append(", undefined: "); //$NON-NLS-1$
     result.append(undefined);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
index 2f07a49..ff4f2ab 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/MessageReferenceImpl.java
@@ -246,7 +246,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
index 8c1b85b..acd3329 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/NamespaceImpl.java
@@ -224,9 +224,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (URI: ");
+    result.append(" (URI: "); //$NON-NLS-1$
     result.append(uri);
-    result.append(", prefix: ");
+    result.append(", prefix: "); //$NON-NLS-1$
     result.append(prefix);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
index fd1830c..2efa376 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/OperationImpl.java
@@ -808,11 +808,11 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (style: ");
+    result.append(" (style: "); //$NON-NLS-1$
     result.append(style);
-    result.append(", name: ");
+    result.append(", name: "); //$NON-NLS-1$
     result.append(name);
-    result.append(", undefined: ");
+    result.append(", undefined: "); //$NON-NLS-1$
     result.append(undefined);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
index 8f82e4c..2ed6900 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PartImpl.java
@@ -12,8 +12,7 @@
 
 
 import java.util.HashMap;
-import java.util.Iterator; 
-// import javax.wsdl.WSDLException;
+import java.util.Iterator; // import javax.wsdl.WSDLException;
 import java.util.Map;
 
 import javax.xml.namespace.QName;
@@ -583,11 +582,11 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
-    result.append(", elementName: ");
+    result.append(", elementName: "); //$NON-NLS-1$
     result.append(elementName);
-    result.append(", typeName: ");
+    result.append(", typeName: "); //$NON-NLS-1$
     result.append(typeName);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
index 5c208da..1d150e1 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortImpl.java
@@ -277,7 +277,7 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (name: ");
+    result.append(" (name: "); //$NON-NLS-1$
     result.append(name);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
index 58ba231..4983f68 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/PortTypeImpl.java
@@ -393,9 +393,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
+    result.append(" (qName: "); //$NON-NLS-1$
     result.append(qName);
-    result.append(", undefined: ");
+    result.append(", undefined: "); //$NON-NLS-1$
     result.append(undefined);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
index 801c3db..28a76de 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/ServiceImpl.java
@@ -356,9 +356,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (qName: ");
+    result.append(" (qName: "); //$NON-NLS-1$
     result.append(qName);
-    result.append(", undefined: ");
+    result.append(", undefined: "); //$NON-NLS-1$
     result.append(undefined);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
index dcb2910..822bcac 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLElementImpl.java
@@ -275,9 +275,9 @@
       return super.toString();
 
     StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (documentationElement: ");
+    result.append(" (documentationElement: "); //$NON-NLS-1$
     result.append(documentationElement);
-    result.append(", element: ");
+    result.append(", element: "); //$NON-NLS-1$
     result.append(element);
     result.append(')');
     return result.toString();
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
index 2e7094d..58813d5 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLFactoryImpl.java
@@ -45,7 +45,7 @@
   {
     try
     {
-      WSDLFactory theWSDLFactory = (WSDLFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.ibm.com/wsdl/2003/WSDL");
+      WSDLFactory theWSDLFactory = (WSDLFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/wsdl/2003/WSDL"); //$NON-NLS-1$ 
       if (theWSDLFactory != null)
       {
         return theWSDLFactory;
@@ -121,7 +121,7 @@
       case WSDLPackage.XSD_SCHEMA_EXTENSIBILITY_ELEMENT:
       return createXSDSchemaExtensibilityElement();
       default:
-      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -145,7 +145,7 @@
       case WSDLPackage.DOM_DOCUMENT:
       return createDOMDocumentFromString(eDataType, initialValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
@@ -169,7 +169,7 @@
       case WSDLPackage.DOM_DOCUMENT:
       return convertDOMDocumentToString(eDataType, instanceValue);
       default:
-      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+      throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
     }
   }
 
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
index 6926615..79f2408 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/internal/impl/WSDLPackageImpl.java
@@ -1948,1531 +1948,694 @@
     messageReferenceEClass.getESuperTypes().add(this.getWSDLElement());
 
     // Initialize classes and features; add operations and parameters
-    initEClass(wsdlElementEClass, WSDLElement.class, "WSDLElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(wsdlElementEClass, WSDLElement.class, "WSDLElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getWSDLElement_DocumentationElement(),
       this.getDOMElement(),
-      "documentationElement",
-      null,
-      0,
-      1,
-      WSDLElement.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "documentationElement", null, 0, 1, WSDLElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getWSDLElement_Element(),
       this.getDOMElement(),
-      "element",
-      null,
-      0,
-      1,
-      WSDLElement.class,
-      IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "element", null, 0, 1, WSDLElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    EOperation op = addEOperation(wsdlElementEClass, this.getDefinition(), "getEnclosingDefinition", 0, 1);
+    EOperation op = addEOperation(wsdlElementEClass, this.getDefinition(), "getEnclosingDefinition", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(wsdlElementEClass, null, "setEnclosingDefinition");
-    addEParameter(op, this.getDefinition(), "definition", 0, 1);
+    op = addEOperation(wsdlElementEClass, null, "setEnclosingDefinition"); //$NON-NLS-1$
+    addEParameter(op, this.getDefinition(), "definition", 0, 1); //$NON-NLS-1$
 
-    initEClass(portTypeEClass, PortType.class, "PortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(portTypeEClass, PortType.class, "PortType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getPortType_QName(),
       this.getQName(),
-      "qName",
-      null,
-      0,
-      1,
-      PortType.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "qName", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getPortType_Undefined(),
       ecorePackage.getEBoolean(),
-      "undefined",
-      null,
-      0,
-      1,
-      PortType.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "undefined", null, 0, 1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getPortType_EOperations(),
       this.getOperation(),
       null,
-      "eOperations",
-      null,
-      0,
-      -1,
-      PortType.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eOperations", null, 0, -1, PortType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getOperation_Style(),
       this.getOperationType(),
-      "style",
-      null,
-      0,
-      1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "style", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getOperation_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getOperation_Undefined(),
       ecorePackage.getEBoolean(),
-      "undefined",
-      null,
-      0,
-      1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "undefined", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getOperation_EInput(),
       this.getInput(),
       null,
-      "eInput",
-      null,
-      0,
-      1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eInput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getOperation_EOutput(),
       this.getOutput(),
       null,
-      "eOutput",
-      null,
-      0,
-      1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eOutput", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getOperation_EFaults(),
       this.getFault(),
       null,
-      "eFaults",
-      null,
-      0,
-      -1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eFaults", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getOperation_EParameterOrdering(),
       this.getPart(),
       null,
-      "eParameterOrdering",
-      null,
-      0,
-      -1,
-      Operation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eParameterOrdering", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(messageEClass, Message.class, "Message", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getMessage_QName(),
       this.getQName(),
-      "qName",
-      null,
-      0,
-      1,
-      Message.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "qName", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getMessage_Undefined(),
       ecorePackage.getEBoolean(),
-      "undefined",
-      null,
-      0,
-      1,
-      Message.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "undefined", null, 0, 1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getMessage_EParts(),
       this.getPart(),
       null,
-      "eParts",
-      null,
-      0,
-      -1,
-      Message.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eParts", null, 0, -1, Message.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(partEClass, Part.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(partEClass, Part.class, "Part", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getPart_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getPart_ElementName(),
       this.getQName(),
-      "elementName",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "elementName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getPart_TypeName(),
       this.getQName(),
-      "typeName",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "typeName", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getPart_TypeDefinition(),
       theXSDPackage.getXSDTypeDefinition(),
       null,
-      "typeDefinition",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "typeDefinition", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getPart_ElementDeclaration(),
       theXSDPackage.getXSDElementDeclaration(),
       null,
-      "elementDeclaration",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "elementDeclaration", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getPart_EMessage(),
       this.getMessage(),
       null,
-      "eMessage",
-      null,
-      0,
-      1,
-      Part.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eMessage", null, 0, 1, Part.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bindingEClass, Binding.class, "Binding", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getBinding_QName(),
       this.getQName(),
-      "qName",
-      null,
-      0,
-      1,
-      Binding.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "qName", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getBinding_Undefined(),
       ecorePackage.getEBoolean(),
-      "undefined",
-      null,
-      0,
-      1,
-      Binding.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "undefined", null, 0, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBinding_EPortType(),
       this.getPortType(),
       null,
-      "ePortType",
-      null,
-      1,
-      1,
-      Binding.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "ePortType", null, 1, 1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBinding_EBindingOperations(),
       this.getBindingOperation(),
       null,
-      "eBindingOperations",
-      null,
-      0,
-      -1,
-      Binding.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBindingOperations", null, 0, -1, Binding.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(bindingOperationEClass, BindingOperation.class, "BindingOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bindingOperationEClass, BindingOperation.class, "BindingOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getBindingOperation_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      BindingOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingOperation_EOperation(),
       this.getOperation(),
       null,
-      "eOperation",
-      null,
-      1,
-      1,
-      BindingOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eOperation", null, 1, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingOperation_EBindingInput(),
       this.getBindingInput(),
       null,
-      "eBindingInput",
-      null,
-      0,
-      1,
-      BindingOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBindingInput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingOperation_EBindingOutput(),
       this.getBindingOutput(),
       null,
-      "eBindingOutput",
-      null,
-      0,
-      1,
-      BindingOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBindingOutput", null, 0, 1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingOperation_EBindingFaults(),
       this.getBindingFault(),
       null,
-      "eBindingFaults",
-      null,
-      0,
-      -1,
-      BindingOperation.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBindingFaults", null, 0, -1, BindingOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getService_QName(),
       this.getQName(),
-      "qName",
-      null,
-      0,
-      1,
-      Service.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "qName", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getService_Undefined(),
       ecorePackage.getEBoolean(),
-      "undefined",
-      null,
-      0,
-      1,
-      Service.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "undefined", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getService_EPorts(),
       this.getPort(),
       null,
-      "ePorts",
-      null,
-      0,
-      -1,
-      Service.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "ePorts", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(portEClass, Port.class, "Port", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getPort_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      Port.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getPort_EBinding(),
       this.getBinding(),
       null,
-      "eBinding",
-      null,
-      1,
-      1,
-      Port.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBinding", null, 1, 1, Port.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(
       extensibilityElementEClass,
       ExtensibilityElement.class,
-      "ExtensibilityElement",
-      !IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "ExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getExtensibilityElement_Required(),
       ecorePackage.getEBoolean(),
-      "required",
-      null,
-      0,
-      1,
-      ExtensibilityElement.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "required", null, 0, 1, ExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getExtensibilityElement_ElementType(),
       this.getQName(),
-      "elementType",
-      null,
-      0,
-      1,
-      ExtensibilityElement.class,
-      IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "elementType", null, 0, 1, ExtensibilityElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(definitionEClass, Definition.class, "Definition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getDefinition_TargetNamespace(),
       ecorePackage.getEString(),
-      "targetNamespace",
-      null,
-      0,
-      1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "targetNamespace", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getDefinition_Location(),
       ecorePackage.getEString(),
-      "location",
-      null,
-      0,
-      1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "location", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getDefinition_QName(),
       this.getQName(),
-      "qName",
-      null,
-      0,
-      1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "qName", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getDefinition_Encoding(),
       ecorePackage.getEString(),
-      "encoding",
-      null,
-      0,
-      1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "encoding", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_EImports(),
       this.getImport(),
       null,
-      "eImports",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eImports", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_ETypes(),
       this.getTypes(),
       null,
-      "eTypes",
-      null,
-      0,
-      1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eTypes", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_EMessages(),
       this.getMessage(),
       null,
-      "eMessages",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eMessages", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_EPortTypes(),
       this.getPortType(),
       null,
-      "ePortTypes",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "ePortTypes", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_EBindings(),
       this.getBinding(),
       null,
-      "eBindings",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eBindings", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_EServices(),
       this.getService(),
       null,
-      "eServices",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eServices", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getDefinition_ENamespaces(),
       this.getNamespace(),
       null,
-      "eNamespaces",
-      null,
-      0,
-      -1,
-      Definition.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eNamespaces", null, 0, -1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(definitionEClass, this.getDOMDocument(), "getDocument", 0, 1);
+    op = addEOperation(definitionEClass, this.getDOMDocument(), "getDocument", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(definitionEClass, null, "setDocument");
-    addEParameter(op, this.getDOMDocument(), "document", 0, 1);
+    op = addEOperation(definitionEClass, null, "setDocument"); //$NON-NLS-1$
+    addEParameter(op, this.getDOMDocument(), "document", 0, 1); //$NON-NLS-1$
 
-    initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getImport_NamespaceURI(),
       ecorePackage.getEString(),
-      "namespaceURI",
-      null,
-      0,
-      1,
-      Import.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "namespaceURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getImport_LocationURI(),
       ecorePackage.getEString(),
-      "locationURI",
-      null,
-      0,
-      1,
-      Import.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "locationURI", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getImport_EDefinition(),
       this.getDefinition(),
       null,
-      "eDefinition",
-      null,
-      0,
-      1,
-      Import.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eDefinition", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getImport_ESchema(),
       theXSDPackage.getXSDSchema(),
       null,
-      "eSchema",
-      null,
-      0,
-      1,
-      Import.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eSchema", null, 0, 1, Import.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(importEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1);
+    op = addEOperation(importEClass, theXSDPackage.getXSDSchema(), "getSchema", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(importEClass, null, "setSchema");
-    addEParameter(op, theXSDPackage.getXSDSchema(), "schema", 0, 1);
+    op = addEOperation(importEClass, null, "setSchema"); //$NON-NLS-1$
+    addEParameter(op, theXSDPackage.getXSDSchema(), "schema", 0, 1); //$NON-NLS-1$
 
     initEClass(
       extensibleElementEClass,
       ExtensibleElement.class,
-      "ExtensibleElement",
-      IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "ExtensibleElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
       getExtensibleElement_EExtensibilityElements(),
       this.getExtensibilityElement(),
       null,
-      "eExtensibilityElements",
-      null,
-      0,
-      -1,
-      ExtensibleElement.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eExtensibilityElements", null, 0, -1, ExtensibleElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(extensibleElementEClass, this.getIList(), "getExtensibilityElements", 0, 1);
+    op = addEOperation(extensibleElementEClass, this.getIList(), "getExtensibilityElements", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(extensibleElementEClass, null, "addExtensibilityElement");
-    addEParameter(op, this.getIExtensibilityElement(), "extElement", 0, 1);
+    op = addEOperation(extensibleElementEClass, null, "addExtensibilityElement"); //$NON-NLS-1$
+    addEParameter(op, this.getIExtensibilityElement(), "extElement", 0, 1); //$NON-NLS-1$
 
-    initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(inputEClass, Input.class, "Input", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(outputEClass, Output.class, "Output", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(bindingInputEClass, BindingInput.class, "BindingInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bindingInputEClass, BindingInput.class, "BindingInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getBindingInput_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      BindingInput.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingInput_EInput(),
       this.getInput(),
       null,
-      "eInput",
-      null,
-      1,
-      1,
-      BindingInput.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eInput", null, 1, 1, BindingInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(bindingInputEClass, this.getIInput(), "getInput", 0, 1);
+    op = addEOperation(bindingInputEClass, this.getIInput(), "getInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(bindingInputEClass, null, "setInput");
-    addEParameter(op, this.getIInput(), "input", 0, 1);
+    op = addEOperation(bindingInputEClass, null, "setInput"); //$NON-NLS-1$
+    addEParameter(op, this.getIInput(), "input", 0, 1); //$NON-NLS-1$
 
-    initEClass(bindingOutputEClass, BindingOutput.class, "BindingOutput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bindingOutputEClass, BindingOutput.class, "BindingOutput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getBindingOutput_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      BindingOutput.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingOutput_EOutput(),
       this.getOutput(),
       null,
-      "eOutput",
-      null,
-      1,
-      1,
-      BindingOutput.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eOutput", null, 1, 1, BindingOutput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(bindingOutputEClass, this.getIOutput(), "getOutput", 0, 1);
+    op = addEOperation(bindingOutputEClass, this.getIOutput(), "getOutput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(bindingOutputEClass, null, "setOutput");
-    addEParameter(op, this.getIOutput(), "output", 0, 1);
+    op = addEOperation(bindingOutputEClass, null, "setOutput"); //$NON-NLS-1$
+    addEParameter(op, this.getIOutput(), "output", 0, 1); //$NON-NLS-1$
 
-    initEClass(bindingFaultEClass, BindingFault.class, "BindingFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(bindingFaultEClass, BindingFault.class, "BindingFault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getBindingFault_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      BindingFault.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getBindingFault_EFault(),
       this.getFault(),
       null,
-      "eFault",
-      null,
-      1,
-      1,
-      BindingFault.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eFault", null, 1, 1, BindingFault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    op = addEOperation(bindingFaultEClass, this.getIFault(), "getFault", 0, 1);
+    op = addEOperation(bindingFaultEClass, this.getIFault(), "getFault", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(bindingFaultEClass, null, "setFault");
-    addEParameter(op, this.getIFault(), "fault", 0, 1);
+    op = addEOperation(bindingFaultEClass, null, "setFault"); //$NON-NLS-1$
+    addEParameter(op, this.getIFault(), "fault", 0, 1); //$NON-NLS-1$
 
-    initEClass(namespaceEClass, Namespace.class, "Namespace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(namespaceEClass, Namespace.class, "Namespace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getNamespace_URI(),
       ecorePackage.getEString(),
-      "URI",
-      null,
-      0,
-      1,
-      Namespace.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "URI", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEAttribute(
       getNamespace_Prefix(),
       ecorePackage.getEString(),
-      "prefix",
-      null,
-      0,
-      1,
-      Namespace.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "prefix", null, 0, 1, Namespace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(iPortTypeEClass, javax.wsdl.PortType.class, "IPortType", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iPortTypeEClass, javax.wsdl.PortType.class, "IPortType", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iPortTypeEClass, null, "addOperation");
-    addEParameter(op, this.getIOperation(), "operation", 0, 1);
+    op = addEOperation(iPortTypeEClass, null, "addOperation"); //$NON-NLS-1$
+    addEParameter(op, this.getIOperation(), "operation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iPortTypeEClass, this.getIOperation(), "getOperation", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1);
+    op = addEOperation(iPortTypeEClass, this.getIOperation(), "getOperation", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iPortTypeEClass, this.getIList(), "getOperations", 0, 1);
+    op = addEOperation(iPortTypeEClass, this.getIList(), "getOperations", 0, 1); //$NON-NLS-1$
 
-    initEClass(iOperationEClass, javax.wsdl.Operation.class, "IOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iOperationEClass, javax.wsdl.Operation.class, "IOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, null, "addFault");
-    addEParameter(op, this.getIFault(), "fault", 0, 1);
+    op = addEOperation(iOperationEClass, null, "addFault"); //$NON-NLS-1$
+    addEParameter(op, this.getIFault(), "fault", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, this.getIFault(), "getFault", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
+    op = addEOperation(iOperationEClass, this.getIFault(), "getFault", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, this.getIMap(), "getFaults", 0, 1);
+    op = addEOperation(iOperationEClass, this.getIMap(), "getFaults", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, this.getIList(), "getParameterOrdering", 0, 1);
+    op = addEOperation(iOperationEClass, this.getIList(), "getParameterOrdering", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, null, "setParameterOrdering");
-    addEParameter(op, this.getIList(), "parameterOrder", 0, 1);
+    op = addEOperation(iOperationEClass, null, "setParameterOrdering"); //$NON-NLS-1$
+    addEParameter(op, this.getIList(), "parameterOrder", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, this.getIInput(), "getInput", 0, 1);
+    op = addEOperation(iOperationEClass, this.getIInput(), "getInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, null, "setInput");
-    addEParameter(op, this.getIInput(), "input", 0, 1);
+    op = addEOperation(iOperationEClass, null, "setInput"); //$NON-NLS-1$
+    addEParameter(op, this.getIInput(), "input", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, this.getIOutput(), "getOutput", 0, 1);
+    op = addEOperation(iOperationEClass, this.getIOutput(), "getOutput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOperationEClass, null, "setOutput");
-    addEParameter(op, this.getIOutput(), "output", 0, 1);
+    op = addEOperation(iOperationEClass, null, "setOutput"); //$NON-NLS-1$
+    addEParameter(op, this.getIOutput(), "output", 0, 1); //$NON-NLS-1$
 
-    initEClass(iInputEClass, javax.wsdl.Input.class, "IInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iInputEClass, javax.wsdl.Input.class, "IInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iInputEClass, this.getIMessage(), "getMessage", 0, 1);
+    op = addEOperation(iInputEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iInputEClass, null, "setMessage");
-    addEParameter(op, this.getIMessage(), "message", 0, 1);
+    op = addEOperation(iInputEClass, null, "setMessage"); //$NON-NLS-1$
+    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
 
-    initEClass(iOutputEClass, javax.wsdl.Output.class, "IOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iOutputEClass, javax.wsdl.Output.class, "IOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iOutputEClass, this.getIMessage(), "getMessage", 0, 1);
+    op = addEOperation(iOutputEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iOutputEClass, null, "setMessage");
-    addEParameter(op, this.getIMessage(), "message", 0, 1);
+    op = addEOperation(iOutputEClass, null, "setMessage"); //$NON-NLS-1$
+    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
 
-    initEClass(iFaultEClass, javax.wsdl.Fault.class, "IFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iFaultEClass, javax.wsdl.Fault.class, "IFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iFaultEClass, this.getIMessage(), "getMessage", 0, 1);
+    op = addEOperation(iFaultEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iFaultEClass, null, "setMessage");
-    addEParameter(op, this.getIMessage(), "message", 0, 1);
+    op = addEOperation(iFaultEClass, null, "setMessage"); //$NON-NLS-1$
+    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
 
-    initEClass(iMessageEClass, javax.wsdl.Message.class, "IMessage", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iMessageEClass, javax.wsdl.Message.class, "IMessage", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iMessageEClass, null, "addPart");
-    addEParameter(op, this.getIPart(), "part", 0, 1);
+    op = addEOperation(iMessageEClass, null, "addPart"); //$NON-NLS-1$
+    addEParameter(op, this.getIPart(), "part", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iMessageEClass, this.getIPart(), "getPart", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
+    op = addEOperation(iMessageEClass, this.getIPart(), "getPart", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iMessageEClass, this.getIMap(), "getParts", 0, 1);
+    op = addEOperation(iMessageEClass, this.getIMap(), "getParts", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iMessageEClass, this.getIList(), "getOrderedParts", 0, 1);
-    addEParameter(op, this.getIList(), "partOrder", 0, 1);
+    op = addEOperation(iMessageEClass, this.getIList(), "getOrderedParts", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getIList(), "partOrder", 0, 1); //$NON-NLS-1$
 
-    initEClass(iPartEClass, javax.wsdl.Part.class, "IPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iPartEClass, javax.wsdl.Part.class, "IPart", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iPartEClass, null, "setExtensionAttribute");
-    addEParameter(op, this.getQName(), "name", 0, 1);
-    addEParameter(op, this.getQName(), "value", 0, 1);
+    op = addEOperation(iPartEClass, null, "setExtensionAttribute"); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "value", 0, 1); //$NON-NLS-1$
     addEException(op, this.getWSDLException());
 
-    op = addEOperation(iPartEClass, this.getIIterator(), "getExtensionAttributeNames", 0, 1);
+    op = addEOperation(iPartEClass, this.getIIterator(), "getExtensionAttributeNames", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iPartEClass, this.getQName(), "getExtensionAttribute", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iPartEClass, this.getQName(), "getExtensionAttribute", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    initEClass(iServiceEClass, javax.wsdl.Service.class, "IService", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iServiceEClass, javax.wsdl.Service.class, "IService", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iServiceEClass, null, "addPort");
-    addEParameter(op, this.getIPort(), "port", 0, 1);
+    op = addEOperation(iServiceEClass, null, "addPort"); //$NON-NLS-1$
+    addEParameter(op, this.getIPort(), "port", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iServiceEClass, this.getIMap(), "getPorts", 0, 1);
+    op = addEOperation(iServiceEClass, this.getIMap(), "getPorts", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iServiceEClass, this.getIPort(), "getPort", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
+    op = addEOperation(iServiceEClass, this.getIPort(), "getPort", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
 
-    initEClass(iPortEClass, javax.wsdl.Port.class, "IPort", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iPortEClass, javax.wsdl.Port.class, "IPort", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iPortEClass, this.getIBinding(), "getBinding", 0, 1);
+    op = addEOperation(iPortEClass, this.getIBinding(), "getBinding", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iPortEClass, null, "setBinding");
-    addEParameter(op, this.getIBinding(), "binding", 0, 1);
+    op = addEOperation(iPortEClass, null, "setBinding"); //$NON-NLS-1$
+    addEParameter(op, this.getIBinding(), "binding", 0, 1); //$NON-NLS-1$
 
-    initEClass(iBindingEClass, javax.wsdl.Binding.class, "IBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iBindingEClass, javax.wsdl.Binding.class, "IBinding", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iBindingEClass, null, "addBindingOperation");
-    addEParameter(op, this.getIBindingOperation(), "bindingOperation", 0, 1);
+    op = addEOperation(iBindingEClass, null, "addBindingOperation"); //$NON-NLS-1$
+    addEParameter(op, this.getIBindingOperation(), "bindingOperation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingEClass, this.getIBindingOperation(), "getBindingOperation", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1);
+    op = addEOperation(iBindingEClass, this.getIBindingOperation(), "getBindingOperation", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "inputName", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "outputName", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingEClass, this.getIList(), "getBindingOperations", 0, 1);
+    op = addEOperation(iBindingEClass, this.getIList(), "getBindingOperations", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingEClass, this.getIPortType(), "getPortType", 0, 1);
+    op = addEOperation(iBindingEClass, this.getIPortType(), "getPortType", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingEClass, null, "setPortType");
-    addEParameter(op, this.getIPortType(), "portType", 0, 1);
+    op = addEOperation(iBindingEClass, null, "setPortType"); //$NON-NLS-1$
+    addEParameter(op, this.getIPortType(), "portType", 0, 1); //$NON-NLS-1$
 
     initEClass(
       iBindingOperationEClass,
       javax.wsdl.BindingOperation.class,
-      "IBindingOperation",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IBindingOperation", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, null, "addBindingFault");
-    addEParameter(op, this.getIBindingFault(), "bindingFault", 0, 1);
+    op = addEOperation(iBindingOperationEClass, null, "addBindingFault"); //$NON-NLS-1$
+    addEParameter(op, this.getIBindingFault(), "bindingFault", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, this.getIBindingFault(), "getBindingFault", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
+    op = addEOperation(iBindingOperationEClass, this.getIBindingFault(), "getBindingFault", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, this.getIMap(), "getBindingFaults", 0, 1);
+    op = addEOperation(iBindingOperationEClass, this.getIMap(), "getBindingFaults", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, this.getIOperation(), "getOperation", 0, 1);
+    op = addEOperation(iBindingOperationEClass, this.getIOperation(), "getOperation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, null, "setOperation");
-    addEParameter(op, this.getIOperation(), "operation", 0, 1);
+    op = addEOperation(iBindingOperationEClass, null, "setOperation"); //$NON-NLS-1$
+    addEParameter(op, this.getIOperation(), "operation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, this.getIBindingInput(), "getBindingInput", 0, 1);
+    op = addEOperation(iBindingOperationEClass, this.getIBindingInput(), "getBindingInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, null, "setBindingInput");
-    addEParameter(op, this.getIBindingInput(), "bindingInput", 0, 1);
+    op = addEOperation(iBindingOperationEClass, null, "setBindingInput"); //$NON-NLS-1$
+    addEParameter(op, this.getIBindingInput(), "bindingInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, this.getIBindingOutput(), "getBindingOutput", 0, 1);
+    op = addEOperation(iBindingOperationEClass, this.getIBindingOutput(), "getBindingOutput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iBindingOperationEClass, null, "setBindingOutput");
-    addEParameter(op, this.getIBindingOutput(), "bindingOutput", 0, 1);
+    op = addEOperation(iBindingOperationEClass, null, "setBindingOutput"); //$NON-NLS-1$
+    addEParameter(op, this.getIBindingOutput(), "bindingOutput", 0, 1); //$NON-NLS-1$
 
-    initEClass(iBindingInputEClass, javax.wsdl.BindingInput.class, "IBindingInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iBindingInputEClass, javax.wsdl.BindingInput.class, "IBindingInput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       iBindingOutputEClass,
       javax.wsdl.BindingOutput.class,
-      "IBindingOutput",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IBindingOutput", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iBindingFaultEClass, javax.wsdl.BindingFault.class, "IBindingFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iBindingFaultEClass, javax.wsdl.BindingFault.class, "IBindingFault", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       iExtensibilityElementEClass,
       javax.wsdl.extensions.ExtensibilityElement.class,
-      "IExtensibilityElement",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IExtensibilityElement", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iDefinitionEClass, javax.wsdl.Definition.class, "IDefinition", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iDefinitionEClass, javax.wsdl.Definition.class, "IDefinition", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addBinding");
-    addEParameter(op, this.getIBinding(), "binding", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addBinding"); //$NON-NLS-1$
+    addEParameter(op, this.getIBinding(), "binding", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addImport");
-    addEParameter(op, this.getIImport(), "importDef", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addImport"); //$NON-NLS-1$
+    addEParameter(op, this.getIImport(), "importDef", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addMessage");
-    addEParameter(op, this.getIMessage(), "message", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addMessage"); //$NON-NLS-1$
+    addEParameter(op, this.getIMessage(), "message", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addNamespace");
-    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addNamespace"); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addPortType");
-    addEParameter(op, this.getIPortType(), "portType", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addPortType"); //$NON-NLS-1$
+    addEParameter(op, this.getIPortType(), "portType", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "addService");
-    addEParameter(op, this.getIService(), "service", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "addService"); //$NON-NLS-1$
+    addEParameter(op, this.getIService(), "service", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBindingFault(), "createBindingFault", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBindingFault(), "createBindingFault", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBindingInput(), "createBindingInput", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBindingInput(), "createBindingInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBindingOutput(), "createBindingOutput", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBindingOutput(), "createBindingOutput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBindingOperation(), "createBindingOperation", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBindingOperation(), "createBindingOperation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "createBinding", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBinding(), "createBinding", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIFault(), "createFault", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIFault(), "createFault", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIImport(), "createImport", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIImport(), "createImport", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIInput(), "createInput", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIInput(), "createInput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "createMessage", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMessage(), "createMessage", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIOperation(), "createOperation", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIOperation(), "createOperation", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIOutput(), "createOutput", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIOutput(), "createOutput", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIPart(), "createPart", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIPart(), "createPart", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIPort(), "createPort", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIPort(), "createPort", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "createPortType", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIPortType(), "createPortType", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIService(), "createService", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIService(), "createService", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "getBinding", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBinding(), "getBinding", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getBindings", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getBindings", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getImports", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getImports", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIList(), "getImports", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIList(), "getImports", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "getMessage", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMessage(), "getMessage", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getMessages", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getMessages", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getNamespace", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1);
+    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getNamespace", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "prefix", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getNamespaces", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getNamespaces", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "getPortType", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIPortType(), "getPortType", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getPortTypes", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getPortTypes", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getPrefix", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1);
+    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getPrefix", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIService(), "getService", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIService(), "getService", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMap(), "getServices", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMap(), "getServices", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIExtensionRegistry(), "getExtensionRegistry", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIExtensionRegistry(), "getExtensionRegistry", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "setExtensionRegistry");
-    addEParameter(op, this.getIExtensionRegistry(), "extensionRegistry", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "setExtensionRegistry"); //$NON-NLS-1$
+    addEParameter(op, this.getIExtensionRegistry(), "extensionRegistry", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getDocumentBaseURI", 0, 1);
+    op = addEOperation(iDefinitionEClass, ecorePackage.getEString(), "getDocumentBaseURI", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "setDocumentBaseURI");
-    addEParameter(op, ecorePackage.getEString(), "documentBase", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "setDocumentBaseURI"); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "documentBase", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getITypes(), "createTypes", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getITypes(), "createTypes", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIService(), "removeService", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIService(), "removeService", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIBinding(), "removeBinding", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIBinding(), "removeBinding", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIPortType(), "removePortType", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIPortType(), "removePortType", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getIMessage(), "removeMessage", 0, 1);
-    addEParameter(op, this.getQName(), "name", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getIMessage(), "removeMessage", 0, 1); //$NON-NLS-1$
+    addEParameter(op, this.getQName(), "name", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, this.getITypes(), "getTypes", 0, 1);
+    op = addEOperation(iDefinitionEClass, this.getITypes(), "getTypes", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(iDefinitionEClass, null, "setTypes");
-    addEParameter(op, this.getITypes(), "types", 0, 1);
+    op = addEOperation(iDefinitionEClass, null, "setTypes"); //$NON-NLS-1$
+    addEParameter(op, this.getITypes(), "types", 0, 1); //$NON-NLS-1$
 
-    initEClass(iImportEClass, javax.wsdl.Import.class, "IImport", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iImportEClass, javax.wsdl.Import.class, "IImport", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iListEClass, List.class, "IList", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iListEClass, List.class, "IList", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iMapEClass, Map.class, "IMap", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iMapEClass, Map.class, "IMap", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iurlEClass, URL.class, "IURL", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iurlEClass, URL.class, "IURL", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       iExtensionRegistryEClass,
       ExtensionRegistry.class,
-      "IExtensionRegistry",
-      IS_ABSTRACT,
-      IS_INTERFACE,
-      !IS_GENERATED_INSTANCE_CLASS);
+      "IExtensionRegistry", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(typesEClass, Types.class, "Types", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(typesEClass, Types.class, "Types", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1);
+    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1); //$NON-NLS-1$
 
-    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1);
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1);
+    op = addEOperation(typesEClass, this.getIList(), "getSchemas", 0, 1); //$NON-NLS-1$
+    addEParameter(op, ecorePackage.getEString(), "namespaceURI", 0, 1); //$NON-NLS-1$
 
-    initEClass(iIteratorEClass, Iterator.class, "IIterator", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iIteratorEClass, Iterator.class, "IIterator", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
-    initEClass(iTypesEClass, javax.wsdl.Types.class, "ITypes", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+    initEClass(iTypesEClass, javax.wsdl.Types.class, "ITypes", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     initEClass(
       unknownExtensibilityElementEClass,
       UnknownExtensibilityElement.class,
-      "UnknownExtensibilityElement",
-      !IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "UnknownExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
       getUnknownExtensibilityElement_Children(),
       this.getUnknownExtensibilityElement(),
       null,
-      "children",
-      null,
-      0,
-      -1,
-      UnknownExtensibilityElement.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "children", null, 0, -1, UnknownExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     initEClass(
       xsdSchemaExtensibilityElementEClass,
       XSDSchemaExtensibilityElement.class,
-      "XSDSchemaExtensibilityElement",
-      !IS_ABSTRACT,
-      !IS_INTERFACE,
-      IS_GENERATED_INSTANCE_CLASS);
+      "XSDSchemaExtensibilityElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEReference(
       getXSDSchemaExtensibilityElement_Schema(),
       theXSDPackage.getXSDSchema(),
       null,
-      "schema",
-      null,
-      0,
-      1,
-      XSDSchemaExtensibilityElement.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      IS_COMPOSITE,
-      !IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "schema", null, 0, 1, XSDSchemaExtensibilityElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
-    initEClass(messageReferenceEClass, MessageReference.class, "MessageReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(messageReferenceEClass, MessageReference.class, "MessageReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
     initEAttribute(
       getMessageReference_Name(),
       ecorePackage.getEString(),
-      "name",
-      null,
-      0,
-      1,
-      MessageReference.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_UNSETTABLE,
-      !IS_ID,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "name", null, 0, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
     initEReference(
       getMessageReference_EMessage(),
       this.getMessage(),
       null,
-      "eMessage",
-      null,
-      1,
-      1,
-      MessageReference.class,
-      !IS_TRANSIENT,
-      !IS_VOLATILE,
-      IS_CHANGEABLE,
-      !IS_COMPOSITE,
-      IS_RESOLVE_PROXIES,
-      !IS_UNSETTABLE,
-      IS_UNIQUE,
-      !IS_DERIVED,
-      IS_ORDERED);
+      "eMessage", null, 1, 1, MessageReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
     // Initialize data types
-    initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-    initEDataType(operationTypeEDataType, OperationType.class, "OperationType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-    initEDataType(domElementEDataType, Element.class, "DOMElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-    initEDataType(wsdlExceptionEDataType, WSDLException.class, "WSDLException", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-    initEDataType(domDocumentEDataType, Document.class, "DOMDocument", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+    initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(operationTypeEDataType, OperationType.class, "OperationType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(domElementEDataType, Element.class, "DOMElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(wsdlExceptionEDataType, WSDLException.class, "WSDLException", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+    initEDataType(domDocumentEDataType, Document.class, "DOMDocument", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
     // Create resource
     createResource(eNS_URI);
diff --git a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
index 94235be..e305629 100644
--- a/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
+++ b/bundles/org.eclipse.wst.wsdl/src-wsdl/org/eclipse/wst/wsdl/util/WSDLConstants.java
@@ -109,85 +109,85 @@
    * The element tag is <code>"binding"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String BINDING_ELEMENT_TAG = "binding";
+  public static final String BINDING_ELEMENT_TAG = "binding"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"definitions"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String DEFINITION_ELEMENT_TAG = "definitions";
+  public static final String DEFINITION_ELEMENT_TAG = "definitions"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"documentation"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String DOCUMENTATION_ELEMENT_TAG = "documentation";
+  public static final String DOCUMENTATION_ELEMENT_TAG = "documentation"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"fault"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String FAULT_ELEMENT_TAG = "fault";
+  public static final String FAULT_ELEMENT_TAG = "fault"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"import"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String IMPORT_ELEMENT_TAG = "import";
+  public static final String IMPORT_ELEMENT_TAG = "import"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"input"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String INPUT_ELEMENT_TAG = "input";
+  public static final String INPUT_ELEMENT_TAG = "input"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"message"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String MESSAGE_ELEMENT_TAG = "message";
+  public static final String MESSAGE_ELEMENT_TAG = "message"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"operation"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String OPERATION_ELEMENT_TAG = "operation";
+  public static final String OPERATION_ELEMENT_TAG = "operation"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"output"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String OUTPUT_ELEMENT_TAG = "output";
+  public static final String OUTPUT_ELEMENT_TAG = "output"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"part"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String PART_ELEMENT_TAG = "part";
+  public static final String PART_ELEMENT_TAG = "part"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"port"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String PORT_ELEMENT_TAG = "port";
+  public static final String PORT_ELEMENT_TAG = "port"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"portType"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String PORT_TYPE_ELEMENT_TAG = "portType";
+  public static final String PORT_TYPE_ELEMENT_TAG = "portType"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"service"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String SERVICE_ELEMENT_TAG = "service";
+  public static final String SERVICE_ELEMENT_TAG = "service"; //$NON-NLS-1$
 
   /**
    * The element tag is <code>"types"</code>.
    * @see #nodeType(String localName).
    */
-  public static final String TYPES_ELEMENT_TAG = "types";
+  public static final String TYPES_ELEMENT_TAG = "types"; //$NON-NLS-1$
 
   // common
 
@@ -195,25 +195,25 @@
    * The attribute is <code>"name"</code>.
    * @see #getAttribute(Element,String).
    */
-  public static final String NAME_ATTRIBUTE = "name";
+  public static final String NAME_ATTRIBUTE = "name"; //$NON-NLS-1$
 
   /**
    * The attribute is <code>"message"</code>.
    * @see #getAttribute(Element,String).
    */
-  public static final String MESSAGE_ATTRIBUTE = "message";
+  public static final String MESSAGE_ATTRIBUTE = "message"; //$NON-NLS-1$
 
   /**
    * The attribute is <code>"binding"</code>.
    * @see #getAttribute(Element,String).
    */
-  public static final String BINDING_ATTRIBUTE = "binding";
+  public static final String BINDING_ATTRIBUTE = "binding"; //$NON-NLS-1$
 
   /**
    * The attribute is <code>"type"</code>.
    * @see #getAttribute(Element,String).
    */
-  public static final String TYPE_ATTRIBUTE = "type";
+  public static final String TYPE_ATTRIBUTE = "type"; //$NON-NLS-1$
 
   // definitions
 
@@ -221,13 +221,13 @@
    * The attribute is <code>"encoding"</code>.
    * @see #getAttribute(Element,String).
    */
-  public final static String ENCODING_ATTRIBUTE = "encoding";
+  public final static String ENCODING_ATTRIBUTE = "encoding"; //$NON-NLS-1$
 
   /**
    * The attribute is <code>"targetNamespace"</code>.
    * @see #getAttribute(Element,String).
    */
-  public final static String TARGETNAMESPACE_ATTRIBUTE = "targetNamespace";
+  public final static String TARGETNAMESPACE_ATTRIBUTE = "targetNamespace"; //$NON-NLS-1$
 
   // binding
 
@@ -235,7 +235,7 @@
    * The attribute is <code>"resourceURI"</code>.
    * @see #getAttribute(Element,String).
    */
-  public final static String RESOURCE_URI_ATTRIBUTE = "resourceURI";
+  public final static String RESOURCE_URI_ATTRIBUTE = "resourceURI"; //$NON-NLS-1$
 
   // part
 
@@ -243,7 +243,7 @@
    * The attribute is <code>"element"</code>.
    * @see #getAttribute(Element,String).
    */
-  public final static String ELEMENT_ATTRIBUTE = "element";
+  public final static String ELEMENT_ATTRIBUTE = "element"; //$NON-NLS-1$
 
   // import
 
@@ -251,38 +251,38 @@
    * The attribute is <code>"location"</code>.
    * @see #getAttribute(Element,String).
    */
-  public final static String LOCATION_ATTRIBUTE = "location";
+  public final static String LOCATION_ATTRIBUTE = "location"; //$NON-NLS-1$
 
   /**
    * The attribute is <code>"namespace"</code>.
    * @see #getAttribute(Element,String).
    */
-  public static final String NAMESPACE_ATTRIBUTE = "namespace";
+  public static final String NAMESPACE_ATTRIBUTE = "namespace"; //$NON-NLS-1$
 
   /**
    * The value <code>"http://schemas.xmlsoap.org/wsdl/"</code>.
    */
-  public static final String WSDL_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/";
+  public static final String WSDL_NAMESPACE_URI = "http://schemas.xmlsoap.org/wsdl/"; //$NON-NLS-1$
 
   /**
    * The value <code>"http://www.w3.org/2001/XMLSchema"</code>.
    */
-  public static final String XSD_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema";
+  public static final String XSD_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
 
   /**
    * The value <code>"http://www.w3.org/1999/XMLSchema"</code>.
    */
-  public static final String SCHEMA_FOR_SCHEMA_URI_1999 = "http://www.w3.org/1999/XMLSchema";
+  public static final String SCHEMA_FOR_SCHEMA_URI_1999 = "http://www.w3.org/1999/XMLSchema"; //$NON-NLS-1$
 
   /**
    * The value <code>"http://www.w3.org/2000/10/XMLSchema"</code>.
    */
-  public static final String SCHEMA_FOR_SCHEMA_URI_2000_10 = "http://www.w3.org/2000/10/XMLSchema";
+  public static final String SCHEMA_FOR_SCHEMA_URI_2000_10 = "http://www.w3.org/2000/10/XMLSchema"; //$NON-NLS-1$
 
   /**
    * The value <code>"http://www.w3.org/2001/XMLSchema"</code>.
    */
-  public static final String SCHEMA_FOR_SCHEMA_URI_2001 = "http://www.w3.org/2001/XMLSchema";
+  public static final String SCHEMA_FOR_SCHEMA_URI_2001 = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
 
   private static final String[] ELEMENT_TAGS = new String []{
     BINDING_ELEMENT_TAG,