1 files changed, 0 insertions, 36 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample26.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample26.wsdl
deleted file mode 100644
index 4343af776..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsNoDepends/sample26.wsdl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample26" xmlns:tns="http://www.example.org/sample26" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample26">
-<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
-</wsdl:types>
-<wsdl:message name="NewOperationResponse">
-<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-</wsdl:message>
-<wsdl:message name="NewOperationRequest">
-<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-</wsdl:message>
-<wsdl:portType name="sample">
-<wsdl:operation name="NewOperation">
-<wsdl:input message="tns:NewOperationRequest"/>
-<wsdl:output message="tns:NewOperationResponse"/>
-</wsdl:operation>
-</wsdl:portType>
-<wsdl:binding name="sampleSOAP" type="tns:sample">
-<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-<wsdl:operation name="NewOperation">
-<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
-<wsdl:input>
-<soap:body use="literal" parts=" NewOperationRequest"/>
-</wsdl:input>
-<wsdl:output>
-<soap:body use="literal" parts=" NewOperationResponse"/>
-</wsdl:output>
-</wsdl:operation>
-</wsdl:binding>
-<wsdl:service name="sample">
-<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
-<soap:address location="http://www.example.org/"/>
-</wsdl:port>
-</wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.classpath b/bundles/org.eclipse.jst.ws.annotations.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.project b/bundles/org.eclipse.jst.ws.annotations.core/.project
deleted file mode 100644
index 133e566..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.annotations.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6ee33b2..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 09 20:36:45 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index ffabbea..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.annotations.core;singleton:=true
-Bundle-Version: 0.5.1.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
-Eclipse-BuddyPolicy: registered
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Export-Package: org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.annotations.core.initialization,
- org.eclipse.jst.ws.annotations.core.processor,
- org.eclipse.jst.ws.annotations.core.utils
-Bundle-Activator: org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/about.html b/bundles/org.eclipse.jst.ws.annotations.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 19, 2009</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/build.properties b/bundles/org.eclipse.jst.ws.annotations.core/build.properties
deleted file mode 100644
index 921a77d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               schema/,\
-               plugin.properties,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties b/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
deleted file mode 100644
index 2a7f89b..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for Annotations Core
-pluginName= Annotations Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml b/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
deleted file mode 100644
index ac23fee..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="annotationCategory" name="Annotation Category" schema="schema/annotationCategory.exsd"/>
-   <extension-point id="annotationDefinition" name="Annotation Definition" schema="schema/annotationDefinition.exsd"/>
-   <extension-point id="annotationInitializer" name="Annotation Initializer" schema="schema/annotationInitializer.exsd"/>
-   <extension-point id="annotationProcessor" name="Annotation Processor" schema="schema/annotationProcessor.exsd"/>
-   
-   <extension point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
-      <factories enableDefault="true">
-         <factory
-            class="org.eclipse.jst.ws.internal.annotations.core.processor.AnnotationsCoreProcessorFactory">
-         </factory>
-      </factories>
-   </extension>
-   
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
deleted file mode 100644
index 9a854be..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationCategory" name="Annotation Category"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to contribute an annotation category.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="category" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="category">
-      <annotation>
-         <documentation>
-            An annotation category contribution defines categories of annotations used to group them in the UI.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier for the annotation category.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A uniqure annotation cateogory name.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation category contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationCategory&quot;&gt;
-      &lt;category
-            id=&quot;jaxws.category&quot;
-            name=&quot;JAX-WS&quot;&gt;
-      &lt;/category&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;ahref=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
deleted file mode 100644
index f212652..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationDefinition" name="Annotation Definition"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to contribute annotations &lt;? extends java.lang.annotation.Annotation&gt; which are in turn consumed by the UI.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="annotation" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="annotation">
-      <complexType>
-         <sequence>
-            <element ref="targetFilter" minOccurs="0" maxOccurs="7"/>
-         </sequence>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the fully qualified annotation class name that extends &lt;code&gt;java.lang.annotation.Annotation&lt;/code&gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="java.lang.annotation.Annotation:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the id of a &lt;tt&gt;annotationCategory&lt;/tt&gt;
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationCategory/category/@id"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The simple name of the annotation class.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="restrictedTo">
-            <annotation>
-               <documentation>
-                  Used in addition to the java.lang.annotation.ElementType(s) that are specified in the value element of the  @Target annotation on the contributed annotation to add further restrictions.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="CLASS_ONLY">
-                  </enumeration>
-                  <enumeration value="INTERFACE_ONLY">
-                  </enumeration>
-                  <enumeration value="ENUM_ONLY">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="targetFilter">
-      <complexType>
-         <attribute name="target" use="required">
-            <annotation>
-               <documentation>
-                  The annotations core automatically knows where to permit annotations as it inspects the contributed annotation and
-                  reads the @Target that has been defined for it. These filters are only used when there might be an extra restriction
-                  you want to add, for example, if version 2 of an annotation allows adding the annotation to a field, and then version
-                  3 deprecates that usage, you can add a filter here to disallow the usage in the UI.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="TYPE">
-                  </enumeration>
-                  <enumeration value="FIELD">
-                  </enumeration>
-                  <enumeration value="METHOD">
-                  </enumeration>
-                  <enumeration value="PARAMETER">
-                  </enumeration>
-                  <enumeration value="CONSTRUCTOR">
-                  </enumeration>
-                  <enumeration value="LOCAL_VARIABLE">
-                  </enumeration>
-                  <enumeration value="ANNOTATION_TYPE">
-                  </enumeration>
-                  <enumeration value="PACKAGE">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation definition contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationDefinition&quot;&gt;
-      &lt;annotation
-            category=&quot;jaxws.category&quot;
-            class=&quot;javax.jws.WebService&quot;
-            name=&quot;WebService&quot;&gt;
-      &lt;/annotation&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
deleted file mode 100644
index 19e1db4..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationInitializer" name="Annotation Initializer"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to associate an annotation initializer with an annotation definition.
-
-The annotation initializers role is to construct values for the annotations member value pairs.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="initializer" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="initializer">
-      <complexType>
-         <attribute name="annotation" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class name of the annotation definition that this initializers handles.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that implements the contributed initializer. The
-class must be a public and extend
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer&lt;/code&gt; with a public 0-argument constructor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation initializer contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationInitializer&quot;&gt;
-      &lt;initializer
-            annotation=&quot;javax.jws.WebService&quot;
-            class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer&quot;&gt;
-      &lt;/initializer&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
deleted file mode 100644
index 8cef659..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationProcessor" name="Annotation Processor"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to contribute annotation procesoors. These processors are associated with contributed annotation definitions.
-
-The goal of the processor is to validate annotation rules.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="processor" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="processor">
-      <complexType>
-         <sequence>
-            <element ref="description" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="annotation" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class name of the annotation definition that this processor handles.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that implements the contributed procesor. The
-class must be a public subclass of
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor&lt;/code&gt;and must have a public 0-argument constructor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description" type="string">
-      <annotation>
-         <documentation>
-            An optional attribute to hold a short text describing what &quot;rule&quot; the processor handles.
-         </documentation>
-      </annotation>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation processor contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationProcessor&quot;&gt;
-      &lt;processor
-            annotation=&quot;javax.jws.WebService&quot;
-            class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIPresentNoWebMethodRule&quot;&gt;
-         &lt;description&gt;
-            %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
-         &lt;/description&gt;
-      &lt;/processor&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
deleted file mode 100644
index 9b2818f..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- * An <code>AnnotationDefinition</code> is a representation of the information contributed through the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code> and
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension points.
- * for a <code>java.lang.annotation.Annotation</code> class.
- * <p>
- * It supplies the annotation class name, its annotation category, the applicable targets for the annotation
- * and an <code>IAnnotationAttributeInitializer</code> to initialize the annotations element-value pairs.
- * </p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationDefinition {
-    private static final String ATT_CLASS = "class"; //$NON-NLS-1$
-    private static final String ATT_NAME = "name"; //$NON-NLS-1$
-    private static final String ATT_RESTRICTED_TO = "restrictedTo"; //$NON-NLS-1$
-
-    private static final String RESTRICTED_TO_CLASS_ONLY = "CLASS_ONLY";
-    private static final String RESTRICTED_TO_INTERFACE_ONLY = "INTERFACE_ONLY";
-    private static final String RESTRICTED_TO_ENUM_ONLY = "ENUM_ONLY";
-
-	private static final String ELEM_TARGET_FILTER = "targetFilter"; //$NON-NLS-1$
-	private static final String ATT_TARGET = "target"; //$NON-NLS-1$
-
-    private IConfigurationElement configurationElement;
-    private String category;
-    private String annotationClassName;
-    private Class<? extends java.lang.annotation.Annotation> annotationClass;
-    private List<ElementType> targets;
-    private String name;
-    private IAnnotationAttributeInitializer annotationInitializer;
-    private String restictedTo;
-    private boolean interfaceOnly;
-    private boolean classOnly;
-    private boolean enumOnly;
-
-    /**
-     * Constructs an <code>AnnotationDefinition</code> using information from the
-     * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point and category name.
-     * @param configurationElement the <code>annotation</code> element from the <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point
-     * @param category the category name
-     */
-    public AnnotationDefinition(IConfigurationElement configurationElement, String category) {
-        this.configurationElement = configurationElement;
-        this.category = category;
-
-        this.annotationClassName = AnnotationsManager.getAttributeValue(configurationElement, ATT_CLASS);
-        this.name = AnnotationsManager.getAttributeValue(configurationElement, ATT_NAME);
-        this.restictedTo = AnnotationsManager.getAttributeValue(configurationElement,
-                ATT_RESTRICTED_TO);
-        this.classOnly = restictedTo.equals(RESTRICTED_TO_CLASS_ONLY);
-        this.interfaceOnly = restictedTo.equals(RESTRICTED_TO_INTERFACE_ONLY);
-        this.enumOnly = restictedTo.equals(RESTRICTED_TO_ENUM_ONLY);
-    }
-
-    /**
-     * Returns the annotation name.
-     * @return the annotation name.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Returns the category the annotation belongs to.
-     * @return the annotation category.
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * Returns the fully qualified class name of the annotation.
-     * @return the fully qualified class name of the annotation.
-     */
-    public String getAnnotationClassName() {
-        return annotationClassName;
-    }
-
-    /**
-     * Returns whether the annotation is restricted to class types.
-     * @return <code>true</code> if the annotation is restricted to classes only.
-     */
-    public boolean isClassOnly() {
-        return classOnly;
-    }
-
-    /**
-     * Returns whether the annotation is restricted to interface types.
-     * @return <code>true</code> if the annotation is restricted to interfaces only.
-     */
-    public boolean isInterfaceOnly() {
-        return interfaceOnly;
-    }
-
-    /**
-     * Returns whether the annotation is restricted to enum types.
-     * @return <code>true</code> if the annotation is restricted to enums only.
-     */
-    public boolean isEnumOnly() {
-        return enumOnly;
-    }
-
-    /**
-     * Returns the annotation class as specified by the <code>class</code> attribute of the
-     * <code>annotation<annotation> element in the <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>
-     * extension point.
-     *
-     * @return the annotation class
-     */
-    @SuppressWarnings("unchecked")
-    public Class<? extends java.lang.annotation.Annotation> getAnnotationClass() {
-        if (annotationClass == null) {
-            try {
-                Class<?> aClass = Class.forName(annotationClassName);
-                if (aClass.isAnnotation()) {
-                    annotationClass = (Class<java.lang.annotation.Annotation>)Class.forName(
-                            annotationClassName);
-                }
-            } catch(ClassNotFoundException cnfe) {
-                AnnotationsCorePlugin.log(cnfe);
-            }
-        }
-        return annotationClass;
-    }
-
-    /**
-     * Returns a list of {@link ElementType} that specify the Java elements to which the annotation
-     * can be applied.
-     * <p>
-     * The element types are retrieved from the annotations
-     * {@link java.lang.annotation.Target} meta-annotation type. This list can be filtered using
-     * the <code>targetFilter</code> element on the
-     * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point when defining
-     * the annotation.
-     * </p>
-     * @return a list of element types.
-     */
-    public List<ElementType> getTargets() {
-        if (targets == null) {
-        	targets = new LinkedList<ElementType>();
-
-            Class<? extends java.lang.annotation.Annotation> annotation = getAnnotationClass();
-            if (annotation != null) {
-            	Target target = annotation.getAnnotation(Target.class);
-            	if (target != null) {
-            	    targets.addAll(Arrays.asList(target.value()));
-
-                    List<ElementType> filteredTargets = getFilteredTargets(configurationElement);
-                    if (targets.containsAll(filteredTargets) && filteredTargets.size() < targets.size()) {
-                        targets.removeAll(filteredTargets);
-                    }
-            	}
-            }
-        }
-        return targets;
-    }
-
-    /**
-     * Returns the annotations attribute initializer as specified in the
-     * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point or null if no
-     * initializer can be found.
-     *
-     * @return the <code>IAnnotationAttributeInitializer</code>
-     */
-    public IAnnotationAttributeInitializer getAnnotationAttributeInitializer() {
-        if (annotationInitializer == null) {
-            try {
-                IConfigurationElement configurationElement =
-                    AnnotationsManager.getAnnotationInitializerCache().get(getAnnotationClassName());
-                if (configurationElement != null) {
-                    annotationInitializer = (IAnnotationAttributeInitializer)configurationElement
-                        .createExecutableExtension(ATT_CLASS);
-                }
-            } catch (CoreException ce) {
-                AnnotationsCorePlugin.log(ce.getStatus());
-            }
-        }
-        return annotationInitializer;
-    }
-
-	  private List<ElementType> getFilteredTargets(IConfigurationElement configurationElement) {
-		  List<ElementType> targets = new ArrayList<ElementType>(7);
-		  try {
-			  IConfigurationElement[] deprecatedTargets = configurationElement.getChildren(ELEM_TARGET_FILTER);
-			  for (IConfigurationElement deprecatedTargetElement : deprecatedTargets) {
-				  String target = AnnotationsManager.getAttributeValue(deprecatedTargetElement, ATT_TARGET);
-				  targets.add(ElementType.valueOf(target));
-			  }
-		  } catch (IllegalArgumentException iae) {
-			  AnnotationsCorePlugin.log(iae);
-		  }
-		  return targets;
-	  }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
deleted file mode 100644
index 47eb451..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ArrayInitializer;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MarkerAnnotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.NumberLiteral;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-/**
- * Utility class for creating annotations and member value pairs.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationsCore {
-
-    private AnnotationsCore() {
-    }
-
-    /**
-     * Creates a new {@link NormalAnnotation}.
-     *
-     * @param ast the {@link AST} that will be used to create the annotation.
-     * @param annotationName the name of the annotation.
-     * @param memberValuePairs a list of {@link MemberValuePair} to add to the normal annotation.
-     * @return a normal annotation with the given member value pairs.
-     */
-    public static NormalAnnotation createNormalAnnotation(AST ast, String annotationName, List<MemberValuePair> memberValuePairs) {
-        NormalAnnotation annotation = ast.newNormalAnnotation();
-
-        Name annotationTypeName = ast.newName(annotationName);
-
-        annotation.setTypeName(annotationTypeName);
-
-        if (memberValuePairs != null) {
-            for (MemberValuePair memberValuePair : memberValuePairs) {
-                @SuppressWarnings("unchecked")
-                List<MemberValuePair> annotationValues = annotation.values();
-                annotationValues.add(memberValuePair);
-            }
-        }
-        return annotation;
-    }
-
-    /**
-     * Creates a new {@link SingleMemberAnnotation}.
-     *
-     * @param ast the {@link AST} that will be used to create the annotation.
-     * @param annotationName the name of the annotation.
-     * @param value the {@link Expression} to set as the single member annotation value.
-     * @return a single member annotation with the given value.
-     */
-    public static SingleMemberAnnotation createSingleMemberAnnotation(AST ast, String annotationName, Expression value) {
-        SingleMemberAnnotation annotation = ast.newSingleMemberAnnotation();
-
-        Name annotationTypeName = ast.newName(annotationName);
-
-        annotation.setTypeName(annotationTypeName);
-
-        if (value != null) {
-        	value = (Expression)Expression.copySubtree(ast, value);
-        	annotation.setValue(value);
-        }
-
-        return annotation;
-    }
-
-    /**
-     * Creates a new {@link MarkerAnnotation}.
-     *
-     * @param ast the {@link AST} that will be used to create the annotation.
-     * @param annotationName the name of the annotation.
-     * @return a marker annotation.
-     */
-    public static MarkerAnnotation createMarkerAnnotation(AST ast, String annotationName) {
-        MarkerAnnotation annotation = ast.newMarkerAnnotation();
-
-        Name annotationTypeName = ast.newName(annotationName);
-
-        annotation.setTypeName(annotationTypeName);
-
-        return annotation;
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair}.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param name the {@link MemberValuePair} "name".
-     * @param expression the {@link Expression} "value" of the member value pair.
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createMemberValuePair(AST ast, String name, Expression expression) {
-        MemberValuePair memberValuePair = ast.newMemberValuePair();
-        memberValuePair.setName(ast.newSimpleName(name));
-        memberValuePair.setValue(expression);
-        return memberValuePair;
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with a {@link StringLiteral} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param name the member value pair "name".
-     * @param value the <code>String</code> "value".
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createStringMemberValuePair(AST ast, String name, String value) {
-        MemberValuePair stringMemberValuePair = AnnotationsCore.createMemberValuePair(ast, name,
-                AnnotationsCore.createStringLiteral(ast, value.toString()));
-
-        return stringMemberValuePair;
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with a {@link BooleanLiteral} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param name the member value pair "name".
-     * @param value the <code>Boolean</code> "value".
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createBooleanMemberValuePair(AST ast, String name, Boolean value) {
-        MemberValuePair booleanValuePair = AnnotationsCore.createMemberValuePair(ast, name, AnnotationsCore
-                .createBooleanLiteral(ast, value.booleanValue()));
-
-        return booleanValuePair;
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with a {@link NumberLiteral} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param name the member value pair "name".
-     * @param value the <code>String</code> "value" representing the number.
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createNumberMemberValuePair(AST ast, String name, String value) {
-        MemberValuePair primitiveValuePair = AnnotationsCore.createMemberValuePair(ast, name,
-                AnnotationsCore.createNumberLiteral(ast, value.toString()));
-        return primitiveValuePair;
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with a {@link Name} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param className the enclosing class name.
-     * @param name the member value pair "name".
-     * @param value an object representing the <code>enum</code> value.
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createEnumMemberValuePair(AST ast, String className, String name,
-            Object value) {
-         return AnnotationsCore.createMemberValuePair(ast, name, createEnumLiteral(ast, className, value));
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with a {@link TypeLiteral} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param name the member value pair "name".
-     * @param value an object representing the type value.
-     * @return a new member value pair with the given name and value.
-     */
-    public static MemberValuePair createTypeMemberValuePair(AST ast, String name, Object value) {
-        return AnnotationsCore.createMemberValuePair(ast, name,
-                createTypeLiteral(ast, value));
-    }
-
-    /**
-     * Creates a new {@link MemberValuePair} with an {@link ArrayInitializer} value.
-     *
-     * @param ast the {@link AST} that will be used to create the member value pair.
-     * @param method a {@link java.lang.annotation.Annotation} member.
-     * @param values an array of <code>Object</code> values.
-     * @return a new member value pair with the given name and array of values.
-     */
-    public static MemberValuePair createArrayMemberValuePair(AST ast, Method method, Object[] values) {
-        return AnnotationsCore.createMemberValuePair(ast, method.getName(), createArrayValueLiteral(ast,
-                method, values));
-    }
-
-    /**
-     * Creates a new {@link ArrayInitializer}.
-     * @param ast the {@link AST} that will be used to create the {@link ArrayInitializer}.
-     * @param method a {@link java.lang.annotation.Annotation} member.
-     * @param values an array of <code>Object</code> values.
-     * @return a new srray initializer.
-     */
-    @SuppressWarnings("unchecked")
-    public static ArrayInitializer createArrayValueLiteral(AST ast, Method method, Object[] values) {
-        ArrayInitializer arrayInitializer = ast.newArrayInitializer();
-        for (Object value : values) {
-            if (value instanceof java.lang.annotation.Annotation) {
-                //TODO Handle this situation. Arises when annotations are specified as defaults in array initializers
-            }
-            if (value instanceof List) {
-                Class<? extends java.lang.annotation.Annotation> annotationClass =
-                 (Class<? extends java.lang.annotation.Annotation>) method.getReturnType().getComponentType();
-
-                List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-                List<Map<String, Object>> valuesList = (List<Map<String, Object>>) value;
-                Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
-                while (valuesIterator.hasNext()) {
-                    Map<String, Object> annotationMap = valuesIterator.next();
-                    Set<Entry<String, Object>> entrySet = annotationMap.entrySet();
-                    Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
-                    while (iterator.hasNext()) {
-                        Map.Entry<java.lang.String, Object> entry = iterator.next();
-                        String memberName = entry.getKey();
-                        try {
-                            Method annotationMethod = annotationClass.getMethod(memberName, new Class[0]);
-                            if (annotationMethod != null) {
-                                Object memberValue = entry.getValue();
-                                Class<?> returnType = annotationMethod.getReturnType();
-                                if (returnType.equals(String.class)) {
-                                    memberValuePairs.add(createStringMemberValuePair(ast, memberName,
-                                            memberValue.toString()));
-                                }
-                                if (returnType.equals(Boolean.TYPE)) {
-                                    memberValuePairs.add(createBooleanMemberValuePair(ast, memberName,
-                                            (Boolean) memberValue));
-                                }
-                                if (returnType.equals(Class.class)) {
-                                    String className = memberValue.toString();
-                                    if (className.endsWith(".class")) {
-                                        className = className.substring(0, className.lastIndexOf("."));
-                                    }
-                                    memberValuePairs.add(AnnotationsCore.createMemberValuePair(ast, memberName,
-                                            createTypeLiteral(ast, className)));
-                                }
-//                                if (returnType.isPrimitive()) {
-//                                    memberValuePairs.add(getNumberMemberValuePair(ast, memberName, memberValue));
-//                                }
-                            }
-
-                        } catch (SecurityException se) {
-                            AnnotationsCorePlugin.log(se);
-                        } catch (NoSuchMethodException nsme) {
-                            AnnotationsCorePlugin.log(nsme);
-                        }
-                    }
-                }
-                arrayInitializer.expressions().add(createNormalAnnotation(ast, annotationClass.getCanonicalName(),
-                        memberValuePairs));
-            }
-            if (value.equals(Class.class)) {
-                arrayInitializer.expressions().add(createTypeLiteral(ast, value.toString()));
-            }
-            if (value instanceof String) {
-                String stringValue = value.toString();
-                if (stringValue.endsWith(".class")) {
-                    arrayInitializer.expressions().add(createTypeLiteral(ast, stringValue.substring(0,
-                            stringValue.lastIndexOf("."))));
-                } else {
-                    arrayInitializer.expressions().add(createStringLiteral(ast, stringValue));
-                }
-            }
-        }
-        return arrayInitializer;
-    }
-
-    /**
-     * Creates a new {@link QualifiedName} to represent an <code>enum</code> literal value.
-     *
-     * @param ast the {@link AST} that will be used to create the qualified name.
-     * @param className the fully qualified name of the enclosing class.
-     * @param value sn object representing the <code>enum</code> value.
-     * @return a new qualified name.
-     */
-    public static QualifiedName createEnumLiteral(AST ast, String className, Object value) {
-        QualifiedName enumName = null;
-        SimpleName enumClassName = ast.newSimpleName(value.getClass().getSimpleName());
-        SimpleName enumLiteral = ast.newSimpleName(value.toString());
-        if (value.getClass().isMemberClass()) {
-            Name enumEnclosingClassName = null;
-            String enclosingClassName = value.getClass().getEnclosingClass().getCanonicalName();
-            if (enclosingClassName.equals(className)) {
-                enumEnclosingClassName = ast.newSimpleName(value.getClass().getEnclosingClass()
-                        .getSimpleName());
-            } else {
-                enumEnclosingClassName = ast.newName(enclosingClassName);
-            }
-            QualifiedName qualifiedName = ast.newQualifiedName(enumEnclosingClassName, enumClassName);
-            enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
-        } else {
-            Name qualifiedName = ast.newName(value.getClass().getCanonicalName());
-            enumName = ast.newQualifiedName(qualifiedName, enumLiteral);
-        }
-        return enumName;
-    }
-
-    /**
-     * Creates a new {@link TypeLiteral}.
-     *
-     * @param ast the {@link AST} that will be used to create the {@link TypeLiteral}.
-     * @param value a <code>Class</code> or a <code>String</code> from which to create the type literal.
-     * @return a new type literal or null it the value is not of type <code>Class</code> or <code>String</code>.
-     */
-    public static TypeLiteral createTypeLiteral(AST ast, Object value) {
-        TypeLiteral typeLiteral = null;
-        if (value instanceof Class) {
-            typeLiteral = createTypeLiteral(ast, (Class<?>) value);
-        }
-        if (value instanceof String) {
-            typeLiteral = createTypeLiteral(ast, (String) value);
-        }
-        return typeLiteral;
-    }
-
-    /**
-     * Creates a new {@link TypeLiteral}.
-     *
-     * @param ast the {@link AST} that will be used to create the type literal.
-     * @param value the class value.
-     * @return a new type literal.
-     */
-    public static TypeLiteral createTypeLiteral(AST ast, Class<?> value) {
-        TypeLiteral typeLiteral = ast.newTypeLiteral();
-
-        Class<?> aClass = value;
-        SimpleName className = ast.newSimpleName(aClass.getSimpleName());
-
-        if (aClass.isMemberClass()) {
-            Name enclosingClassName = ast.newName(aClass.getEnclosingClass().getCanonicalName());
-            QualifiedType qualifiedType = ast.newQualifiedType(ast.newSimpleType(enclosingClassName), className);
-            typeLiteral.setType(qualifiedType);
-            return typeLiteral;
-        }
-        return createTypeLiteral(ast, value.getCanonicalName());
-    }
-
-    /**
-     * Creates a new {@link TypeLiteral}
-     *
-     * @param ast the {@link AST} that will be used to create the type literal.
-     * @param value the name of the class.
-     * @return a new type literal.
-     */
-    public static TypeLiteral createTypeLiteral(AST ast, String value) {
-        TypeLiteral typeLiteral = ast.newTypeLiteral();
-
-        if (value.indexOf(".") == -1) { //$NON-NLS-1$
-            typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(value)));
-        } else {
-            String qualifier = value.substring(0, value.lastIndexOf(".")); //$NON-NLS-1$
-            String identifier = value.substring(value.lastIndexOf(".") + 1); //$NON-NLS-1$
-            if (qualifier.equals("java.lang")) { //$NON-NLS-1$
-                typeLiteral.setType(ast.newSimpleType(ast.newSimpleName(identifier)));
-            } else {
-                typeLiteral.setType(ast.newQualifiedType(ast.newSimpleType(ast.newName(qualifier)), ast
-                        .newSimpleName(identifier)));
-            }
-        }
-        return typeLiteral;
-    }
-
-    /**
-     * Creates a new {@link StringLiteral}.
-     * @param ast the {@link AST} that will be used to create the string literal.
-     * @param literalValue the string value.
-     * @return a new string literal.
-     */
-    public static StringLiteral createStringLiteral(AST ast, String literalValue) {
-        StringLiteral stringLiteral = ast.newStringLiteral();
-        stringLiteral.setLiteralValue(literalValue);
-        return stringLiteral;
-    }
-
-    /**
-     * Creates a new {@link BooleanLiteral}.
-     * @param ast the {@link AST} that will be used to create the boolean literal.
-     * @param value the boolean value.
-     * @return a new boolean literal.
-     */
-    public static BooleanLiteral createBooleanLiteral(AST ast, boolean value) {
-        BooleanLiteral booleanLiteral = ast.newBooleanLiteral(value);
-        return booleanLiteral;
-    }
-
-    /**
-     * Creates a new {@link NumberLiteral}.
-     * @param ast the {@link AST} that will be used to create the {@link NumberLiteral}.
-     * @param value the number value.
-     * @return a new number literal.
-     */
-    public static NumberLiteral createNumberLiteral(AST ast, String value) {
-        NumberLiteral primitiveLiteral = ast.newNumberLiteral();
-        primitiveLiteral.setToken(value);
-        return primitiveLiteral;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java
deleted file mode 100644
index ed04679..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * 
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under 
- * development and expected to change significantly before reaching stability. It is being made available at 
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses 
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
- */
-public class AnnotationsCorePlugin extends Plugin {
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.annotations.core"; //$NON-NLS-1$
-    
-    // The shared instance
-    private static AnnotationsCorePlugin plugin;
-    
-    public static AnnotationsCorePlugin getDefault() {
-      return plugin;
-    }
-    
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-    
-    public static void logMessage(int severity, String message) {
-        AnnotationsCorePlugin.log(new Status(severity, AnnotationsCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        AnnotationsCorePlugin.getDefault().getLog().log(status);
-    }
-
-    public static void log(Throwable exception) {
-        AnnotationsCorePlugin.log(new Status(IStatus.ERROR, AnnotationsCorePlugin.PLUGIN_ID, exception
-                .getLocalizedMessage(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
deleted file mode 100644
index 0a2341b..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- * Manages the annotation categories, definitions, processors and initializers contributed through the
- * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationCategory</code>,
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> and
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension points.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationsManager {
-	private static final String ANNOTATION_DEFINITION = "annotationDefinition"; //$NON-NLS-1$
-	private static final String ANNOTATION_CATEGORY = "annotationCategory"; //$NON-NLS-1$
-	private static final String ANNOTATION_INITIALIZER = "annotationInitializer"; //$NON-NLS-1$
-	private static final String ANNOTATION_PROCESSOR = "annotationProcessor"; //$NON-NLS-1$
-	private static final String ANNOTATION = "annotation"; //$NON-NLS-1$
-
-	private static List<AnnotationDefinition> annotationCache = null;
-	private static Map<String, String> annotationCategoryCache = null;
-	private static Map<String, IConfigurationElement> annotationInitializerCache = null;
-	private static Map<String, List<IConfigurationElement>> annotationProcessorCache = null;
-	private static Map<String, List<AnnotationDefinition>> annotationsByCategoryMap = null;
-	private static Map<String, AnnotationDefinition> annotationClassNameToDefinitionMap;
-	private static Map<String, AnnotationDefinition> annotationSimpleNameToDefinitionMap;
-	private static Map<String, AnnotationDefinition> annotationQualifiedNameToDefinitionMap;
-
-	private static final String ATT_ID = "id"; //$NON-NLS-1$
-	private static final String ATT_NAME = "name"; //$NON-NLS-1$
-	private static final String ATT_CATEGORY = "category"; //$NON-NLS-1$
-
-//	private static final String ELEM_TARGET_FILTER = "targetFilter"; //$NON-NLS-1$
-//	private static final String ATT_TARGET = "target"; //$NON-NLS-1$
-
-	private AnnotationsManager() {
-	}
-
-	/**
-	 * Returns a list of {@link AnnotationDefinition} constructed from contributions to the
-	 * <code>org.eclipse.jst.ws.annotations.core.annotationDefinition</code> extension point.
-	 *
-	 * @return a list of annotation definitions.
-	 */
-	public static synchronized List<AnnotationDefinition> getAnnotations() {
-		if (annotationCache == null) {
-			annotationCache = new ArrayList<AnnotationDefinition>();
-
-			IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-					AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_DEFINITION);
-			if (extensionPoint != null) {
-				IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-				for (int i = 0; i < elements.length; i++) {
-					IConfigurationElement element = elements[i];
-					if (element.getName().equals(ANNOTATION)) {
-						AnnotationDefinition annotationDefinition = new AnnotationDefinition(element,
-								getAnnotationCategory(getAttributeValue(element, ATT_CATEGORY)));
-						annotationCache.add(annotationDefinition);
-					}
-				}
-			}
-		}
-		return annotationCache;
-	}
-
-	/**
-	 * Returns a list of all the contributed {@link java.lang.annotation.Annotation} that target the given java element type.
-	 *
-	 * @param element one of
-	 * <li>org.eclipse.jdt.core.IPackageDeclaration</li>
-	 * <li>org.eclipse.jdt.core.IType</li>
-	 * <li>org.eclipse.jdt.core.IField</li>
-	 * <li>org.eclipse.jdt.core.IMethod</li>
-	 * <li>org.eclipse.jdt.core.ILocalVariable</li>
-	 *
-	 * @return a list of annotations.
-	 */
-	public static List<Class<? extends Annotation>> getAnnotations(Object element) {
-		List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-
-		try {
-			List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(element);
-
-			filterAnnotationsList(element, annotationDefinitions);
-
-			for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-				annotations.add(annotationDefinition.getAnnotationClass());
-			}
-		} catch (JavaModelException jme) {
-			AnnotationsCorePlugin.log(jme.getStatus());
-		}
-		return annotations;
-	}
-
-	private static synchronized Map<String, AnnotationDefinition> getAnnotationToClassNameDefinitionMap() {
-
-		if (annotationClassNameToDefinitionMap == null) {
-			List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
-			annotationClassNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
-			for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-				annotationClassNameToDefinitionMap.put(annotationDefinition.getAnnotationClass()
-						.getCanonicalName(), annotationDefinition);
-			}
-		}
-		return annotationClassNameToDefinitionMap;
-	}
-
-	private static synchronized Map<String, AnnotationDefinition> getSimpleNameToDefinitionMap() {
-		if (annotationSimpleNameToDefinitionMap == null) {
-			List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
-			annotationSimpleNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
-			for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-				annotationSimpleNameToDefinitionMap.put(annotationDefinition.getName(), annotationDefinition);
-			}
-		}
-		return annotationSimpleNameToDefinitionMap;
-	}
-
-	private static synchronized Map<String, AnnotationDefinition> getQualifiedNameToDefinitionMap() {
-		if (annotationQualifiedNameToDefinitionMap == null) {
-			List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
-			annotationQualifiedNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
-			for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-				annotationQualifiedNameToDefinitionMap.put(annotationDefinition.getAnnotationClassName(),
-						annotationDefinition);
-			}
-		}
-		return annotationQualifiedNameToDefinitionMap;
-	}
-
-//	 @SuppressWarnings("unchecked")
-//	 public static AnnotationDefinition getAnnotationDefinitionForClass(Object element) {
-//		 if (element instanceof Class && ((Class<?>)element).isAnnotation()) {
-//			 return getAnnotationToClassNameDefinitionMap().get(
-//					 ((Class<? extends Annotation>) element).getCanonicalName());
-//		 }
-//		 return null;
-//	 }
-
-	 /**
-	  * Returns the {@link AnnotationDefinition} for the given {@link java.lang.annotation.Annotation} class
-	  * or null if no annotation definition can be found.
-	  * @param annotationClass the <code>java.lang.annotation.Annotation</code> class.
-	  * @return the annotation definition for the <code>java.lang.annotation.Annotation</code> class.
-	  */
-	 public static AnnotationDefinition getAnnotationDefinitionForClass(Class<? extends Annotation> annotationClass) {
-		 return getAnnotationToClassNameDefinitionMap().get(annotationClass.getCanonicalName());
-	 }
-
-	 /**
-	  * Returns the {@link AnnotationDefinition} for the given fully qualified {@link java.lang.annotation.Annotation} class
-	  * name or null if no annotation definition can be found.
-	  * @param canonicalName the fully qualified name of the <code>java.lang.annotation.Annotation</code> class.
-	  * @return the annotation definition for the fully qualified <code>java.lang.annotation.Annotation</code> class name.
-	  */
-	 public static AnnotationDefinition getAnnotationDefinitionForClass(String canonicalName) {
-		 return getAnnotationToClassNameDefinitionMap().get(canonicalName);
-	 }
-
-	 /**
-	  * Returns the {@link IAnnotationAttributeInitializer} for the given {@link org.eclipse.jdt.core.dom.Name}
-	  * or null if none can be found.
-	  * @param name a {@link SimpleName} or {@link QualifiedName} for the annotation to search for.
-	  * @return an <code>IAnnotationAttributeInitializer</code> for the given name.
-	  */
-	 public static IAnnotationAttributeInitializer getAnnotationAttributeInitializerForName(Name name) {
-		 if (name != null) {
-			 if (name.isSimpleName() && getSimpleNameToDefinitionMap().containsKey(((SimpleName) name).getIdentifier())) {
-				 return getSimpleNameToDefinitionMap().get(((SimpleName) name).getIdentifier()).getAnnotationAttributeInitializer();
-			 } else if (name.isQualifiedName() && getQualifiedNameToDefinitionMap().containsKey(name.getFullyQualifiedName())) {
-				 return getQualifiedNameToDefinitionMap().get(name.getFullyQualifiedName()).getAnnotationAttributeInitializer();
-			 }
-		 }
-		 return null;
-	 }
-
-	 /**
-	  * Returns a list of all the {@link AnnotationDefinition} with the given annotation category name.
-	  * @param categoryName the annotation category name.
-	  * @return a list of annotation definitions.
-	  */
-	 public static synchronized List<AnnotationDefinition> getAnnotationsByCategory(String categoryName) {
-		 if (annotationsByCategoryMap == null) {
-			 annotationsByCategoryMap = new HashMap<String, List<AnnotationDefinition>>();
-			 for (AnnotationDefinition annotationDefinition : getAnnotations()) {
-
-				 List<AnnotationDefinition> annotationDefinitionList = annotationsByCategoryMap.get(
-						 annotationDefinition.getCategory());
-
-				 if (annotationDefinitionList == null) {
-					 annotationDefinitionList = new ArrayList<AnnotationDefinition>();
-					 annotationDefinitionList.add(annotationDefinition);
-					 annotationsByCategoryMap.put(annotationDefinition.getCategory(),
-							 annotationDefinitionList);
-					 continue;
-				 }
-				 annotationDefinitionList.add(annotationDefinition);
-			 }
-		 }
-		 return annotationsByCategoryMap.get(categoryName);
-	 }
-
-	 /**
-	  * Returns a list of the annotation categories.
-	  * @return a list of annotation categories.
-	  */
-	 public static List<String> getAnnotationCategories() {
-		 return Arrays.asList(getAnnotationCategoryCache().values().toArray(
-				 new String[getAnnotationCategoryCache().size()]));
-	 }
-
-	 private static String getAnnotationCategory(String categoryId) {
-		 return getAnnotationCategoryCache().get(categoryId);
-	 }
-
-	 private static synchronized Map<String, String> getAnnotationCategoryCache() {
-		 if (annotationCategoryCache != null) {
-			 return annotationCategoryCache;
-		 }
-
-		 annotationCategoryCache = new HashMap<String, String>();
-
-		 IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-				 AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_CATEGORY);
-		 if (extensionPoint != null) {
-			 IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			 for (int i = 0; i < elements.length; i++) {
-				 IConfigurationElement element = elements[i];
-				 annotationCategoryCache.put(getAttributeValue(element, ATT_ID),
-						 getAttributeValue(element, ATT_NAME));
-			 }
-		 }
-		 return annotationCategoryCache;
-	 }
-
-     protected static synchronized Map<String, IConfigurationElement> getAnnotationInitializerCache() {
-		  if (annotationInitializerCache != null) {
-			  return annotationInitializerCache;
-		  }
-
-		  annotationInitializerCache = new HashMap<String, IConfigurationElement>();
-
-		  IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-				  AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_INITIALIZER);
-		  if (extensionPoint != null) {
-			  IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-			  for (int i = 0; i < elements.length; i++) {
-				  IConfigurationElement element = elements[i];
-				  annotationInitializerCache.put(getAttributeValue(element, ANNOTATION),
-						  element);
-			  }
-		  }
-		  return annotationInitializerCache;
-	  }
-
-	  public static synchronized Map<String, List<IConfigurationElement>> getAnnotationProcessorsCache() {
-		  if (annotationProcessorCache == null) {
-			  annotationProcessorCache = new HashMap<String, List<IConfigurationElement>>();
-
-			  IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-					  AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_PROCESSOR);
-			  if (extensionPoint != null) {
-				  IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-				  for (int i = 0; i < elements.length; i++) {
-					  IConfigurationElement element = elements[i];
-					  if (element.getName().equalsIgnoreCase("processor")) {
-						  String annotationKey = getAttributeValue(element, ANNOTATION);
-						  List<IConfigurationElement> configurationElements = annotationProcessorCache.get(
-								  annotationKey);
-						  if (configurationElements == null) {
-							  configurationElements = new ArrayList<IConfigurationElement>();
-							  configurationElements.add(element);
-							  annotationProcessorCache.put(annotationKey, configurationElements);
-							  continue;
-						  }
-						  configurationElements.add(element);
-					  }
-				  }
-			  }
-		  }
-		  return annotationProcessorCache;
-	  }
-
-	  public static String getAttributeValue(IConfigurationElement configurationElement, String attributeName) {
-		  String attribute = configurationElement.getAttribute(attributeName);
-		  if (attribute != null) {
-			  return attribute;
-		  }
-		  return ""; //$NON-NLS-1$
-	  }
-
-//	  public static List<ElementType> getFilteredTargets(IConfigurationElement configurationElement) {
-//		  List<ElementType> targets = new ArrayList<ElementType>(7);
-//		  try {
-//			  IConfigurationElement[] deprecatedTargets = configurationElement.getChildren(ELEM_TARGET_FILTER);
-//			  for (IConfigurationElement deprecatedTargetElement : deprecatedTargets) {
-//				  String target = AnnotationsManager.getAttributeValue(deprecatedTargetElement, ATT_TARGET);
-//				  targets.add(ElementType.valueOf(target));
-//			  }
-//		  } catch (IllegalArgumentException iae) {
-//			  AnnotationsCorePlugin.log(iae);
-//		  }
-//		  return targets;
-//	  }
-
-	  private static List<AnnotationDefinition> getAllAnnotationsForElement(Object element)
-	  throws JavaModelException {
-
-		  if (element instanceof IPackageDeclaration) {
-			  return getAnnotationsForElementType(ElementType.PACKAGE);
-		  }
-
-		  if (element instanceof IType) {
-			  IType type = (IType) element;
-			  if (type.isAnnotation()) {
-				  return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
-			  }
-			  return getAnnotationsForElementType(ElementType.TYPE);
-		  }
-
-		  if (element instanceof IField) {
-			  return getAnnotationsForElementType(ElementType.FIELD);
-		  }
-
-		  if (element instanceof IMethod) {
-			  return getAnnotationsForElementType(ElementType.METHOD);
-		  }
-
-		  if (element instanceof SingleVariableDeclaration) {
-			  return getAnnotationsForElementType(ElementType.PARAMETER);
-		  }
-
-		  if (element instanceof ILocalVariable) {
-			  return getAnnotationsForElementType(ElementType.PARAMETER);
-		  }
-
-		  if (element instanceof IAnnotation) {
-			  return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
-		  }
-
-		  return Collections.emptyList();
-	  }
-
-	  private static List<AnnotationDefinition> getAnnotationsForElementType(ElementType elementType) {
-		  List<AnnotationDefinition> annotationDefinitions = new ArrayList<AnnotationDefinition>();
-
-		  if (annotationCache == null) {
-			  getAnnotations();
-		  }
-
-		  for (AnnotationDefinition annotationDefinition : annotationCache) {
-			  if (annotationDefinition.getTargets().contains(elementType) &&
-					  !isDeprecated(annotationDefinition)) {
-				  annotationDefinitions.add(annotationDefinition);
-			  }
-		  }
-		  return annotationDefinitions;
-	  }
-
-	  private static void filterAnnotationsList(Object element,
-			  List<AnnotationDefinition> annotationDefinitions) throws JavaModelException {
-		  Iterator<AnnotationDefinition> annotationIter = annotationDefinitions.iterator();
-		  while (annotationIter.hasNext()) {
-			  AnnotationDefinition annotationDefinition = annotationIter.next();
-
-			  if (element instanceof IType) {
-				  IType type = (IType) element;
-				  if (isClassRestricted(type, annotationDefinition)
-						  || isInterfaceRestricted(type, annotationDefinition)
-						  || isEnumRestricted(type, annotationDefinition)) {
-					  annotationIter.remove();
-				  }
-			  }
-			  if (element instanceof IMethod) {
-				  IMethod method = (IMethod) element;
-				  if (method.isMainMethod()) {
-					  annotationIter.remove();
-				  }
-				  if (method.isConstructor()
-						  && !annotationDefinition.getTargets().contains(ElementType.CONSTRUCTOR)) {
-					  annotationIter.remove();
-				  }
-
-				  if (isClassRestricted(method, annotationDefinition)
-						  || isInterfaceRestricted(method, annotationDefinition)
-						  || isEnumRestricted(method, annotationDefinition)) {
-					  annotationIter.remove();
-				  }
-			  }
-
-			  if (element instanceof IField) {
-				  if(isClassRestricted((IField) element, annotationDefinition)
-						  || isInterfaceRestricted((IField) element, annotationDefinition)
-						  ||isEnumRestricted((IField) element, annotationDefinition)) {
-					  annotationIter.remove();
-				  }
-			  }
-		  }
-	  }
-
-	  private static boolean isClassRestricted(IJavaElement javaElement,
-			  AnnotationDefinition annotationDefinition) throws JavaModelException {
-		  if (javaElement.getElementType() == IJavaElement.TYPE) {
-			  return !((IType)javaElement).isClass() && annotationDefinition.isClassOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.METHOD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isClass() && annotationDefinition.isClassOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.FIELD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isClass() && annotationDefinition.isClassOnly();
-		  }
-		  return false;
-	  }
-
-	  private static boolean isInterfaceRestricted(IJavaElement javaElement,
-			  AnnotationDefinition annotationDefinition) throws JavaModelException {
-		  if (javaElement.getElementType() == IJavaElement.TYPE) {
-			  return !((IType)javaElement).isInterface() && annotationDefinition.isInterfaceOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.METHOD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isInterface()  && annotationDefinition.isInterfaceOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.FIELD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isInterface() && annotationDefinition.isInterfaceOnly();
-		  }
-		  return false;
-	  }
-
-	  private static boolean isEnumRestricted(IJavaElement javaElement,
-			  AnnotationDefinition annotationDefinition) throws JavaModelException {
-		  if (javaElement.getElementType() == IJavaElement.TYPE) {
-			  return !((IType)javaElement).isEnum() && annotationDefinition.isEnumOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.METHOD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isEnum() && annotationDefinition.isEnumOnly();
-		  }
-		  if (javaElement.getElementType() == IJavaElement.FIELD) {
-			  IType type = (IType)javaElement.getParent();
-			  return !type.isEnum() && annotationDefinition.isEnumOnly();
-		  }
-		  return false;
-	  }
-
-	  //TODO Move the Deprecated option to preferences
-	  private static boolean isDeprecated(AnnotationDefinition annotationDefinition) {
-		  Class<?> annotationClass = annotationDefinition.getAnnotationClass();
-		  return annotationClass.getAnnotation(java.lang.Deprecated.class) != null;
-	  }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
deleted file mode 100644
index cfb4311..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Base class for initializers contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.
- * <p>
- * Provides default implementations for all methods.
- * </p>
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under development and
- * expected to change significantly before reaching stability. It is being made available at this early stage
- * to solicit feedback from pioneering adopters on the understanding that any code that uses this API will
- * almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
-*/
-public class AnnotationAttributeInitializer implements IAnnotationAttributeInitializer {
-
-    protected static final String MISSING_IDENTIFER = "$missing$";
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, java.lang.Class)
-	 */
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        return Collections.emptyList();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getCompletionProposalsForMemberValuePair(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.MemberValuePair)
-	 */
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-        return Collections.emptyList();
-    }
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getCompletionProposalsForSingleMemberAnnotation(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.SingleMemberAnnotation)
-	 */
-    public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
-            SingleMemberAnnotation singleMemberAnnotation) {
-        return Collections.emptyList();
-    }
-
-    protected CompletionProposal createCompletionProposal(String proposal, Expression value) {
-        Image image = PlatformUI.getWorkbench().getSharedImages().getImage(org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
-        return createCompletionProposal(proposal, value, image, proposal);
-    }
-
-    protected CompletionProposal createCompletionProposal(String proposal, Expression value, Image image,
-            String displayString) {
-        int replacementOffset = value.getStartPosition();
-        int replacementLength = 0;
-        if (value.toString().equals(MISSING_IDENTIFER)) {
-            if (proposal.charAt(0) != '\"') {
-                proposal = "\"" + proposal;
-            }
-            if (proposal.charAt(proposal.length() - 1) != '\"') {
-                proposal = proposal + "\"";
-            }
-        } else {
-            replacementOffset += 1;
-            replacementLength = value.getLength() - 2;
-        }
-
-        return new CompletionProposal(proposal, replacementOffset, replacementLength, proposal.length(),
-                image, displayString, null, null);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
deleted file mode 100644
index 92c9bf7..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.initialization;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-/**
- * Constructs {@link MemberValuePair} from the defaults found in the given {@link java.lang.annotation.Annotation}.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public class DefaultsAnnotationAttributeInitializer extends AnnotationAttributeInitializer {
-
-    public DefaultsAnnotationAttributeInitializer() {
-    }
-
-    /**
-     * Constructs a list of {@link MemberValuePair} using the declared method names and default values in
-     * the given {@link java.lang.annotation.Annotation}.
-     *  @see org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer#getMemberValuePairs(org.eclipse.jdt.core.IJavaElement, org.eclipse.jdt.core.dom.AST, java.lang.Class)
-     */
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        return getMemberValuePairs(ast, annotationClass);
-    }
-
-    private List<MemberValuePair> getMemberValuePairs(AST ast,
-            Class<? extends Annotation> annotationClass) {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        Method[] declaredMethods = annotationClass.getDeclaredMethods();
-        for (Method method : declaredMethods) {
-            String name = method.getName();
-            Class<?> returnType = method.getReturnType();
-            Object defaultValue = method.getDefaultValue();
-
-            if (defaultValue != null) {
-                if (returnType.equals(String.class)) {
-                    memberValuePairs.add(AnnotationsCore.createStringMemberValuePair(ast,
-                            name, defaultValue.toString()));
-                }
-
-                if (returnType.equals(Boolean.TYPE)) {
-                    memberValuePairs.add(AnnotationsCore.createBooleanMemberValuePair(ast,
-                            name, Boolean.parseBoolean(defaultValue.toString())));
-                }
-
-                if (returnType.isPrimitive() && (returnType.equals(Byte.TYPE) || returnType.equals(Short.TYPE)
-                        || returnType.equals(Integer.TYPE) || returnType.equals(Long.TYPE)
-                        || returnType.equals(Float.TYPE) || returnType.equals(Double.TYPE))) {
-                    memberValuePairs.add(AnnotationsCore.createNumberMemberValuePair(ast, name, defaultValue.toString()));
-                }
-
-                if (returnType.isArray()) {
-                    memberValuePairs.add(AnnotationsCore.createArrayMemberValuePair(ast, method,
-                            (Object[])defaultValue));
-                }
-
-                if (returnType.isEnum()) {
-                    memberValuePairs.add(AnnotationsCore.createEnumMemberValuePair(ast,
-                            method.getDeclaringClass().getCanonicalName(), name, defaultValue));
-                }
-
-                if (returnType.equals(Class.class)) {
-                    memberValuePairs.add(AnnotationsCore.createTypeMemberValuePair(ast, name,
-                            defaultValue));
-                }
-            }
-        }
-        return memberValuePairs;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
deleted file mode 100644
index a4d81b2..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.initialization;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Base class for initializers contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public interface IAnnotationAttributeInitializer {
-
-	/**
-	 * Returns a list of {@link MemberValuePair} that may be added to a {@link NormalAnnotation}.
-	 * @param javaElement the java element on which the annotation is declared.
-	 * @param ast the <code>AST</code> with which to create the member value pairs.
-	 * @param annotationClass the {@link java.lang.annotation.Annotation} class which may be
-	 * used to query the declared members of the annotation type and the members default values.
-	 * @return a list of member value pairs.
-	 */
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends java.lang.annotation.Annotation> annotationClass);
-
-    /**
-     * Used to provide a list of {@link ICompletionProposal} for a {@link MemberValuePair} value.
-	 * @param javaElement the java element on which the annotation is declared.
-     * @param memberValuePair the member value pair in which content assist was invoked.
-     * @return a list of completion proposals.
-     */
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair);
-
-    /**
-     * Used to provide a list of {@link ICompletionProposal} for a {@link SingleMemberAnnotation} value.
-	 * @param javaElement the java element on which the annotation is declared.
-     * @param singleMemberAnnotation the single member annotation in which content assist was invoked.
-     * @return a list of completion proposals.
-     */
-    public List<ICompletionProposal> getCompletionProposalsForSingleMemberAnnotation(IJavaElement javaElement,
-            SingleMemberAnnotation singleMemberAnnotation);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
deleted file mode 100644
index cf388d3..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.processor;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.util.SourcePosition;
-
-/**
- * Abstract base class for processors contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension point.
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- *
- */
-public abstract class AbstractAnnotationProcessor implements AnnotationProcessor {
-    protected AnnotationProcessorEnvironment environment;
-
-    /**
-     * Set the {@link AnnotationProcessorEnvironment} environment to use during processing.
-     * @param environment the annotation processor environment.
-     */
-    public void setAnnotationProcessorEnvironment(AnnotationProcessorEnvironment environment) {
-        this.environment = environment;
-    }
-
-    /**
-     * Process all program elements supported by this annotation processor.
-     * @see com.sun.mirror.apt.AnnotationProcessor
-     */
-     public abstract void process();
-
-    protected void printError(AnnotationTypeDeclaration annotationDeclaration ,
-            MethodDeclaration methodDeclaration, String errorMessage) {
-
-        Collection<AnnotationMirror> annotationMirrors = methodDeclaration.getAnnotationMirrors();
-        for (AnnotationMirror mirror : annotationMirrors) {
-            if (mirror.getAnnotationType().toString().equals(annotationDeclaration.getQualifiedName())) {
-                environment.getMessager().printError(mirror.getPosition(), errorMessage);
-            }
-        }
-    }
-
-    protected void printError(SourcePosition position, String message) {
-        environment.getMessager().printError(position, message);
-    }
-
-    protected void printError(String message) {
-        environment.getMessager().printError(message);
-    }
-
-    protected void printWarning(SourcePosition position, String message) {
-        environment.getMessager().printWarning(position, message);
-    }
-
-    protected void printWarning(String message) {
-        environment.getMessager().printWarning(message);
-    }
-
-    protected void printNotice(SourcePosition position, String message) {
-        environment.getMessager().printNotice(position, message);
-    }
-
-    protected void printNotice(String message) {
-        environment.getMessager().printNotice(message);
-    }
-
-    protected void printFixableError(SourcePosition position, String message) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableError(position, message, "", message);
-    }
-
-    protected void printFixableError(SourcePosition position, String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableError(position, message, pluginId, errorId);
-    }
-
-    protected void printFixableError(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableError(message, pluginId, errorId);
-    }
-
-    protected void printFixableWarning(SourcePosition position, String message, String pluginId,
-            String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableWarning(position, message, pluginId, errorId);
-    }
-
-    protected void printFixableWarning(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableWarning(message, pluginId, errorId);
-    }
-
-
-    protected void printFixableNotice(SourcePosition position, String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableNotice(position, message, pluginId, errorId);
-    }
-
-    protected void printFixableNotice(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableNotice(message, pluginId, errorId);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
deleted file mode 100644
index 2787e10..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
+++ /dev/null
@@ -1,1472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC, Shane Clarke
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IONA Technologies PLC - initial API and implementation
- *    Shane Clarke - Rewrote API
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.utils;
-
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.SingleMemberAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ListRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-
-/**
- * Utility class for adding, removing and updating annotations and member value pairs.
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under
- * development and expected to change significantly before reaching stability. It is being made available at
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- */
-public final class AnnotationUtils {
-
-    private AnnotationUtils() {
-    }
-
-    /**
-     * Adds an import to the compilation unit of the given {@link IJavaElement}.
-     * @param javaElement the java element which is used to get the compilation unit to add the import to.
-     * The following types of java elements are supported:
-     * <li>IJavaElement.COMPILATION_UNIT</li>
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param qualifiedName the import to add.
-     * @throws CoreException the exception is thrown if the import rewrite fails.
-     */
-    public static void addImport(IJavaElement javaElement, String qualifiedName) throws CoreException {
-        TextFileChange change = new TextFileChange("Add Import", (IFile) javaElement.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        change.setEdit(multiTextEdit);
-
-        TextEdit annotationEdit = AnnotationUtils.createAddImportTextEdit(javaElement, qualifiedName);
-        change.addEdit(annotationEdit);
-        applyChange(null, change);
-    }
-
-    /**
-     * Removes an import from the compilation unit of the given {@link IJavaElement}. The import will not be removed if the
-     * import type is referenced on more than one annotatable element in the source code. This method
-     * is intended to be used in conjunction with {@link AnnotationUtils#removeAnnotation(IJavaElement, Annotation)}}.
-     * @param javaElement the java element which is used to get the compilation unit to remove the import from.
-     * The following types of java elements are supported:
-     * <li>IJavaElement.COMPILATION_UNIT</li>
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param qualifiedName the import to remove.
-     * @throws CoreException the exception is thrown if the import rewrite fails.
-     */
-    public static void removeImport(IJavaElement javaElement, String qualifiedName) throws CoreException {
-        TextFileChange change = new TextFileChange("Remove Import", (IFile) javaElement.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        change.setEdit(multiTextEdit);
-
-        TextEdit annotationEdit = AnnotationUtils.createRemoveImportTextEdit(javaElement, qualifiedName);
-        change.addEdit(annotationEdit);
-        applyChange(null, change);
-    }
-
-    /**
-     * Adds the given {@link Annotation} to the {@link IJavaElement}.
-     * @param javaElement the following types of java elements are supported:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the annotation to add.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void addAnnotation(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
-        TextFileChange change = new TextFileChange("Add annotation", (IFile) javaElement.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        change.setEdit(multiTextEdit);
-
-        TextEdit annotationEdit = AnnotationUtils.createAddAnnotationTextEdit(javaElement, annotation);
-        change.addEdit(annotationEdit);
-        applyChange(null, change);
-    }
-
-    /**
-     * Removes the given {@link Annotation} from the {@link IJavaElement}.
-     * @param javaElement the following types of java elements are supported:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the annotation to remove.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void removeAnnotation(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
-        TextFileChange change = new TextFileChange("Remove annotation", (IFile) javaElement.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        change.setEdit(multiTextEdit);
-
-        TextEdit textEdit = AnnotationUtils.createRemoveAnnotationTextEdit(javaElement, annotation);
-        change.addEdit(textEdit);
-        applyChange(null, change);
-    }
-
-    /**
-     * Adds the {@link MemberValuePair} to the {@link NormalAnnotation}.
-     * @param annotation the normal annotation to add the member value pair to.
-     * @param memberValuePair the member value pair to add.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void addMemberValuePair(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
-        if (annotation.getRoot() instanceof CompilationUnit) {
-            CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
-            TextFileChange change = new TextFileChange("Add Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
-            MultiTextEdit multiTextEdit = new MultiTextEdit();
-            change.setEdit(multiTextEdit);
-
-            TextEdit annotationEdit = AnnotationUtils.createAddMemberValuePairTextEdit(annotation, memberValuePair);
-            change.addEdit(annotationEdit);
-            applyChange(null, change);
-        }
-    }
-
-    /**
-     * Removes the {@link MemberValuePair} from the {@link NormalAnnotation}.
-     * @param annotation the normal annotation from which to remove the member value pair.
-     * @param memberValuePair the member value pair to remove.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void removeMemberValuePair(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
-        if (annotation.getRoot() instanceof CompilationUnit) {
-            CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
-            TextFileChange change = new TextFileChange("Remove Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
-            MultiTextEdit multiTextEdit = new MultiTextEdit();
-            change.setEdit(multiTextEdit);
-
-            TextEdit annotationEdit = AnnotationUtils.createRemoveMemberValuePairTextEdit(annotation, memberValuePair);
-            change.addEdit(annotationEdit);
-            applyChange(null, change);
-        }
-    }
-
-    /**
-     * Updates the {@link MemberValuePair} value with the given {@link ASTNode}.
-     * @param memberValuePair the member value pair to update.
-     * @param value the value to set.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void updateMemberValuePair(MemberValuePair memberValuePair, ASTNode value) throws JavaModelException {
-        if (memberValuePair.getRoot() instanceof CompilationUnit) {
-            CompilationUnit compilationUnit = (CompilationUnit) memberValuePair.getRoot();
-            TextFileChange change = new TextFileChange("Update Member Value Pair", (IFile) compilationUnit.getJavaElement().getResource());
-            MultiTextEdit multiTextEdit = new MultiTextEdit();
-            change.setEdit(multiTextEdit);
-
-            TextEdit annotationEdit = AnnotationUtils.createUpdateMemberValuePairTextEdit(memberValuePair, value);
-            change.addEdit(annotationEdit);
-            applyChange(null, change);
-        }
-    }
-
-    /**
-     * Updates the value of the {@link SingleMemberAnnotation} with the given {@link ASTNode}.
-     * @param annotation the single member annotation to update.
-     * @param value the value to set.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static void updateSingleMemberAnnotation(SingleMemberAnnotation annotation, ASTNode value)  throws JavaModelException {
-        if (annotation.getRoot() instanceof CompilationUnit) {
-            CompilationUnit compilationUnit = (CompilationUnit) annotation.getRoot();
-            TextFileChange change = new TextFileChange("Update Single Member Annotation", (IFile) compilationUnit.getJavaElement().getResource());
-            MultiTextEdit multiTextEdit = new MultiTextEdit();
-            change.setEdit(multiTextEdit);
-
-            TextEdit annotationEdit = AnnotationUtils.createUpdateSingleMemberAnnotationTextEdit(annotation, value);
-            change.addEdit(annotationEdit);
-            applyChange(null, change);
-        }
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the add import change to the source code of the java elements compilation unit.
-     * The compilation unit itself is not modified.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.COMPILATION_UNIT</li>
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * <p>
-     * The java element will be used to create a {@link CompilationUnit} which will in turn be used to create an {@link ImportRewrite}.
-     * </p>
-     * @param qualifiedName the import to add.
-     * @return text edit object describing the add import changes.
-     * @throws CoreException the exception is thrown if the import rewrite fails.
-     */
-    public static TextEdit createAddImportTextEdit(IJavaElement javaElement, String qualifiedName) throws CoreException {
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(getCompilationUnitFromJavaElement(javaElement), SharedASTProvider.WAIT_YES, null);
-        ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-        importRewrite.addImport(qualifiedName);
-        return importRewrite.rewriteImports(null);
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the remove import change to the source code of the java elements compilation unit.
-     * The compilation unit itself is not modified. No change will be recorded if the import type is referenced on more than one an annotatable
-     * element in the source code. This method should be called in conjunction with {@link AnnotationUtils#createRemoveAnnotationTextEdit(IJavaElement, Annotation)}}.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.COMPILATION_UNIT</li>
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * <p>
-     * The java element will be used to create a {@link CompilationUnit} which will in turn be used to create an {@link ImportRewrite}.
-     * </p>
-     * @param qualifiedName the annotation import to remove.
-     * @return text edit object describing the remove import changes.
-     * @throws CoreException the exception is thrown if the import rewrite fails.
-     */
-    @SuppressWarnings("unchecked")
-    public static TextEdit createRemoveImportTextEdit(IJavaElement javaElement, String qualifiedName) throws CoreException {
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(getCompilationUnitFromJavaElement(javaElement), SharedASTProvider.WAIT_YES, null);
-        ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-        final String annotationSimpleName = qualifiedName.substring(qualifiedName.lastIndexOf(".") + 1);
-        final List<String> occurences = new ArrayList<String>();
-        AnnotationDefinition annotationDefinition = AnnotationsManager.getAnnotationDefinitionForClass(qualifiedName);
-        List<ElementType> elementTypes = Collections.emptyList();
-        if (annotationDefinition != null) {
-            elementTypes = annotationDefinition.getTargets();
-        }
-        for (ElementType elementType : elementTypes) {
-            if (elementType == ElementType.PACKAGE) {
-                compilationUnit.accept(new ASTVisitor() {
-                    @Override
-                    public boolean visit(PackageDeclaration packageDeclaration) {
-                        countAnnotationOccurrences(packageDeclaration.annotations(),
-                                annotationSimpleName, occurences);
-                        return false;
-                    }
-                });
-            }
-            if (elementType == ElementType.TYPE) {
-                compilationUnit.accept(new ASTVisitor() {
-                    @Override
-                    public boolean visit(TypeDeclaration typeDeclaration) {
-                        countAnnotationOccurrences(typeDeclaration.modifiers(),
-                                annotationSimpleName, occurences);
-                        return false;
-                    }
-                });
-            }
-            if (elementType == ElementType.FIELD) {
-                compilationUnit.accept(new ASTVisitor() {
-                    @Override
-                    public boolean visit(FieldDeclaration fieldDeclaration) {
-                        countAnnotationOccurrences(
-                                fieldDeclaration.modifiers(),
-                                annotationSimpleName, occurences);
-                        return false;
-                    }
-                });
-            }
-            if (elementType == ElementType.METHOD) {
-                compilationUnit.accept(new ASTVisitor() {
-                    @Override
-                    public boolean visit(MethodDeclaration methodDeclaration) {
-                        countAnnotationOccurrences(methodDeclaration
-                                .modifiers(), annotationSimpleName, occurences);
-                        return false;
-                    }
-                });
-            }
-            if (elementType == ElementType.PARAMETER) {
-                compilationUnit.accept(new ASTVisitor() {
-                    @Override
-                    public boolean visit(
-                            SingleVariableDeclaration singleVariableDeclaration) {
-                        countAnnotationOccurrences(singleVariableDeclaration
-                                .modifiers(), annotationSimpleName, occurences);
-                        return false;
-                    }
-                });
-            }
-        }
-        if (occurences.size() == 1) {
-            importRewrite.removeImport(qualifiedName);
-        }
-        // TODO Cleanup imports. Repeatedly adding and removing an import
-        // where none existed before will
-        // insert a new line on each insert.
-        return importRewrite.rewriteImports(null);
-    }
-
-    private static void countAnnotationOccurrences(List<IExtendedModifier> modifiers, String annotationSimpleName,
-            List<String> occurences) {
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation existingAnnotation = (Annotation) extendedModifier;
-                if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationSimpleName)) {
-                    occurences.add(annotationSimpleName);
-                }
-            }
-        }
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the add annotation change to the source code of the java elements compilation unit.
-     * The compilation unit itself is not modified.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the annotation to add.
-     * @return text edit object describing the add annotation changes. Returns a {@link MultiTextEdit} if the given java element isn't supported.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static TextEdit createAddAnnotationTextEdit(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
-        switch(javaElement.getElementType()) {
-        case IJavaElement.PACKAGE_DECLARATION:
-            return createAddAnnotationTextEdit((IPackageDeclaration) javaElement, annotation);
-        case IJavaElement.TYPE:
-            return createAddAnnotationTextEdit((IType) javaElement, annotation);
-        case IJavaElement.FIELD:
-            return createAddAnnotationTextEdit((IField) javaElement, annotation);
-        case IJavaElement.METHOD:
-            return createAddAnnotationTextEdit((IMethod) javaElement, annotation);
-        case IJavaElement.LOCAL_VARIABLE:
-            return createAddAnnotationTextEdit((ILocalVariable) javaElement, annotation);
-        default:
-            return new MultiTextEdit();
-        }
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the remove annotation change to the source code of the java elements compilation unit.
-     * The compilation unit itself is not modified.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the annotation to add.
-     * @return text edit object describing the add annotation changes. Returns a {@link MultiTextEdit} if the given java element isn't supported.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when the underlying compilation units
-     * buffer could not be accessed.
-     */
-    public static TextEdit createRemoveAnnotationTextEdit(IJavaElement javaElement, Annotation annotation) throws JavaModelException {
-        switch(javaElement.getElementType()) {
-        case IJavaElement.PACKAGE_DECLARATION:
-            return createRemoveAnnotationTextEdit((IPackageDeclaration) javaElement, annotation);
-        case IJavaElement.TYPE:
-            return createRemoveAnnotationTextEdit((IType) javaElement, annotation);
-        case IJavaElement.FIELD:
-            return createRemoveAnnotationTextEdit((IField) javaElement, annotation);
-        case IJavaElement.METHOD:
-            return createRemoveAnnotationTextEdit((IMethod) javaElement, annotation);
-        case IJavaElement.LOCAL_VARIABLE:
-            return createRemoveAnnotationTextEdit((ILocalVariable) javaElement, annotation);
-        default:
-            return new MultiTextEdit();
-        }
-    }
-
-    private static void applyChange(IProgressMonitor monitor, Change change) {
-        if (change == null) {
-            return;
-        }
-
-        if (monitor == null) {
-            monitor = new NullProgressMonitor();
-        }
-
-        IUndoManager manager = RefactoringCore.getUndoManager();
-        boolean successful = false;
-        Change undoChange = null;
-        try {
-            change.initializeValidationData(monitor);
-            RefactoringStatus valid = change.isValid(monitor);
-            if (valid.isOK()) {
-                manager.aboutToPerformChange(change);
-                undoChange = change.perform(monitor);
-                successful = true;
-            }
-        } catch (CoreException ce) {
-            AnnotationsCorePlugin.log(ce.getStatus());
-        } finally {
-            manager.changePerformed(change, successful);
-        }
-        if (undoChange != null) {
-            undoChange.initializeValidationData(monitor);
-            manager.addUndo(undoChange.getName(), undoChange);
-        }
-    }
-
-    private static TextEdit createAddAnnotationTextEdit(IPackageDeclaration packageDeclaration, Annotation annotation) throws JavaModelException {
-        if (packageDeclaration != null && !isAnnotationPresent(packageDeclaration, AnnotationUtils.getAnnotationName(annotation))) {
-            ICompilationUnit source = getCompilationUnitFromJavaElement(packageDeclaration);
-            CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-            ASTRewrite rewriter = ASTRewrite.create(compilationUnit.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(compilationUnit.getPackage(), PackageDeclaration.ANNOTATIONS_PROPERTY);
-
-            listRewrite.insertFirst(annotation, null);
-
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createRemoveAnnotationTextEdit(IPackageDeclaration packageDeclaration, Annotation annotation) throws JavaModelException {
-        if (packageDeclaration != null && isAnnotationPresent(packageDeclaration, getAnnotationName(annotation))) {
-            ICompilationUnit source = getCompilationUnitFromJavaElement(packageDeclaration);
-            CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-            ASTRewrite rewriter = ASTRewrite.create(compilationUnit.getAST());
-
-            PackageDeclaration pkgDeclaration = compilationUnit.getPackage();
-
-            ListRewrite listRewrite = rewriter.getListRewrite(pkgDeclaration, PackageDeclaration.ANNOTATIONS_PROPERTY);
-
-            @SuppressWarnings("unchecked")
-            List originalList = listRewrite.getOriginalList();
-            for (Object object : originalList) {
-                if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
-                    listRewrite.remove((Annotation) object, null);
-                }
-            }
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createAddAnnotationTextEdit(IType type, Annotation annotation) throws JavaModelException {
-        AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(type);
-        if(typeDeclaration != null && !isAnnotationPresent(type, annotation)) {
-            ASTRewrite rewriter = ASTRewrite.create(typeDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(typeDeclaration, getChildListPropertyDescriptorForType(typeDeclaration));
-
-            listRewrite.insertFirst(annotation, null);
-
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createRemoveAnnotationTextEdit(IType type, Annotation annotation) throws JavaModelException {
-        AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(type);
-        if (typeDeclaration != null && isAnnotationPresent(type, annotation)) {
-            ASTRewrite rewriter = ASTRewrite.create(typeDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(typeDeclaration, getChildListPropertyDescriptorForType(typeDeclaration));
-
-            @SuppressWarnings("unchecked")
-            List originalList = listRewrite.getOriginalList();
-            for (Object object : originalList) {
-                if (object instanceof Annotation && compareAnnotationNames((Annotation)object, annotation)) {
-                    listRewrite.remove((Annotation)object, null);
-                }
-            }
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createAddAnnotationTextEdit(IMethod method, Annotation annotation) throws JavaModelException {
-        MethodDeclaration methodDeclaration = getMethodDeclaration(method);
-        if (methodDeclaration != null && !isAnnotationPresent(method, annotation)) {
-            ASTRewrite rewriter = ASTRewrite.create(methodDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(methodDeclaration,  MethodDeclaration.MODIFIERS2_PROPERTY);
-
-            listRewrite.insertAt(annotation, 0, null);
-
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createRemoveAnnotationTextEdit(IMethod method, Annotation annotation) throws JavaModelException {
-        MethodDeclaration methodDeclaration = getMethodDeclaration(method);
-        if (methodDeclaration != null && isAnnotationPresent(method, annotation)) {
-            ASTRewrite rewriter = ASTRewrite.create(methodDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(methodDeclaration,  MethodDeclaration.MODIFIERS2_PROPERTY);
-
-            @SuppressWarnings("unchecked")
-            List originalList = listRewrite.getOriginalList();
-            for (Object object : originalList) {
-                if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
-                    listRewrite.remove((Annotation) object, null);
-                }
-            }
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createAddAnnotationTextEdit(IField field, Annotation annotation) throws JavaModelException {
-        FieldDeclaration fieldDeclaration = getFieldDeclaration(field);
-        if (fieldDeclaration != null && !isAnnotationPresent(field, annotation)) {
-
-            ASTRewrite rewriter = ASTRewrite.create(fieldDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration, FieldDeclaration.MODIFIERS2_PROPERTY);
-            listRewrite.insertAt(annotation, 0, null);
-
-            return rewriter.rewriteAST();
-        }
-
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createRemoveAnnotationTextEdit(IField field, Annotation annotation) throws JavaModelException {
-        FieldDeclaration fieldDeclaration = getFieldDeclaration(field);
-        if (fieldDeclaration != null && isAnnotationPresent(field, annotation)) {
-            ASTRewrite rewriter = ASTRewrite.create(fieldDeclaration.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration, FieldDeclaration.MODIFIERS2_PROPERTY);
-
-            @SuppressWarnings("unchecked")
-            List originalList = listRewrite.getOriginalList();
-            for (Object object : originalList) {
-                if (object instanceof Annotation && compareAnnotationNames((Annotation) object, annotation)) {
-                    listRewrite.remove((Annotation) object, null);
-                }
-            }
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createAddAnnotationTextEdit(ILocalVariable methodParameter, Annotation annotation) throws JavaModelException {
-        SingleVariableDeclaration parameter = getSingleVariableDeclaration(methodParameter);
-        if (parameter != null && !isAnnotationPresent(methodParameter, AnnotationUtils.getAnnotationName(annotation))) {
-            ASTRewrite rewriter = ASTRewrite.create(parameter.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(parameter, SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
-            listRewrite.insertAt(annotation, -1, null);
-
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    private static TextEdit createRemoveAnnotationTextEdit(ILocalVariable methodParameter, Annotation annotation) throws JavaModelException {
-        SingleVariableDeclaration parameter = getSingleVariableDeclaration(methodParameter);
-        if (isAnnotationPresent(methodParameter, AnnotationUtils.getAnnotationName(annotation))) {
-            ASTRewrite rewriter = ASTRewrite.create(parameter.getAST());
-
-            ListRewrite listRewrite = rewriter.getListRewrite(parameter, SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
-            @SuppressWarnings("unchecked")
-            List originalList = listRewrite.getOriginalList();
-            for (Object object : originalList) {
-                if (object instanceof Annotation && compareAnnotationNames((Annotation)object, annotation)) {
-                    listRewrite.remove((Annotation)object, null);
-                }
-            }
-
-            return rewriter.rewriteAST();
-        }
-        return new MultiTextEdit();
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the change of adding the {@link MemberValuePair} to the {@link NormalAnnotation}.
-     * The underlying compilation unit itself is not modified.
-     * @param annotation the normal annotation to add the member value pair to.
-     * @param memberValuePair the member value pair to add.
-     * @return text edit object describing the add member value pair change.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when
-     * the underlying compilation units buffer could not be accessed.
-     */
-    public static TextEdit createAddMemberValuePairTextEdit(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
-        ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
-        ListRewrite listRewrite = rewriter.getListRewrite(annotation, NormalAnnotation.VALUES_PROPERTY);
-
-        listRewrite.insertLast(memberValuePair, null);
-
-        return rewriter.rewriteAST();
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the change of removing the {@link MemberValuePair} from the {@link NormalAnnotation}.
-     * The underlying compilation unit itself is not modified.
-     * @param annotation the normal annotation to remove the member value pair from.
-     * @param memberValuePair the member value pair to remove.
-     * @return text edit object describing the remove member value pair change.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when
-     * the underlying compilation units buffer could not be accessed.
-     */
-    public static TextEdit createRemoveMemberValuePairTextEdit(NormalAnnotation annotation, MemberValuePair memberValuePair) throws JavaModelException {
-        ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
-        ListRewrite listRewrite = rewriter.getListRewrite(annotation, NormalAnnotation.VALUES_PROPERTY);
-
-        @SuppressWarnings("unchecked")
-        List originalList = listRewrite.getOriginalList();
-        for (Object object : originalList) {
-            if (object instanceof MemberValuePair) {
-                MemberValuePair mvp = (MemberValuePair) object;
-                if (mvp.getName().getIdentifier().equals(memberValuePair.getName().getIdentifier())) {
-                    listRewrite.remove(mvp, null);
-                }
-            }
-        }
-        return rewriter.rewriteAST();
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the change of updating the {@link MemberValuePair} with the {@link ASTNode} value.
-     * The underlying compilation unit itself is not modified.
-     * @param memberValuePair the member value pair to update.
-     * @param value the value to set.
-     * @return text edit object describing the update member value pair change.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when
-     * the underlying compilation units buffer could not be accessed.
-     */
-    public static TextEdit createUpdateMemberValuePairTextEdit(MemberValuePair memberValuePair, ASTNode value) throws JavaModelException {
-        ASTRewrite rewriter = ASTRewrite.create(memberValuePair.getAST());
-
-        rewriter.set(memberValuePair, MemberValuePair.VALUE_PROPERTY, value, null);
-
-        return rewriter.rewriteAST();
-    }
-
-    /**
-     * Creates a {@link TextEdit} object representing the change of updating the {@link SingleMemberAnnotation} with the {@link ASTNode} value.
-     * The underlying compilation unit itself is not modified.
-     * @param annotation the single memeber annotation to update.
-     * @param value the value to set.
-     * @return text edit object describing the update single member annotation change.
-     * @throws JavaModelException A {@link JavaModelException} is thrown when
-     * the underlying compilation units buffer could not be accessed.
-     */
-    public static TextEdit createUpdateSingleMemberAnnotationTextEdit(SingleMemberAnnotation annotation, ASTNode value) throws JavaModelException {
-        ASTRewrite rewriter = ASTRewrite.create(annotation.getAST());
-
-        rewriter.set(annotation, SingleMemberAnnotation.VALUE_PROPERTY, value, null);
-
-        return rewriter.rewriteAST();
-    }
-
-    /**
-     * Returns a {@link ICompilationUnit} for the given {@link IJavaElement}.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.COMPILATION_UNIT</li>
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @return a compilation unit.
-     */
-    public static ICompilationUnit getCompilationUnitFromJavaElement(IJavaElement javaElement) {
-        switch(javaElement.getElementType()) {
-        case IJavaElement.COMPILATION_UNIT:
-            return (ICompilationUnit) javaElement;
-        case IJavaElement.PACKAGE_DECLARATION:
-            IPackageDeclaration packageDeclaration = (IPackageDeclaration) javaElement;
-            return (ICompilationUnit) packageDeclaration.getParent();
-        case IJavaElement.TYPE:
-            IType type = (IType) javaElement;
-            return type.getCompilationUnit();
-        case IJavaElement.METHOD:
-            IMethod method = (IMethod) javaElement;
-            return method.getCompilationUnit();
-        case IJavaElement.FIELD:
-            IField field = (IField) javaElement;
-            return field.getCompilationUnit();
-        case IJavaElement.LOCAL_VARIABLE:
-            ILocalVariable localVariable = (ILocalVariable) javaElement;
-            if (localVariable.getParent() instanceof IMethod) {
-                return getCompilationUnitFromJavaElement(localVariable.getParent());
-            }
-        default:
-            return JavaCore.createCompilationUnitFrom((IFile) javaElement.getResource());
-        }
-    }
-
-    /**
-     * Returns the {@link AbstractTypeDeclaration} that corresponds to the given {@link IType}.
-     * @param type the type.
-     * @return a type declaration or null if not found.
-     */
-    @SuppressWarnings("unchecked")
-    public static AbstractTypeDeclaration getTypeDeclaration(IType type) {
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(type.getCompilationUnit(), SharedASTProvider.WAIT_YES, null);
-        List<TypeDeclaration> types = compilationUnit.types();
-        for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-            if (compareTypeNames(abstractTypeDeclaration, type)) {
-                return abstractTypeDeclaration;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link MethodDeclaration} that corresponds to the given {@link IMethod}.
-     * @param method the method
-     * @return a method declaration or null if not found.
-     */
-    @SuppressWarnings("unchecked")
-    public static MethodDeclaration getMethodDeclaration(IMethod method) {
-        AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(method.getDeclaringType());
-        if (typeDeclaration != null) {
-            List<BodyDeclaration> bodyDeclarations = typeDeclaration.bodyDeclarations();
-            for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
-                if (bodyDeclaration instanceof MethodDeclaration) {
-                    MethodDeclaration methodDeclaration = (MethodDeclaration) bodyDeclaration;
-                    if (compareMethods(methodDeclaration, method)) {
-                        return methodDeclaration;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link FieldDeclaration} that corresponds to the given {@link IField}.
-     * @param field the field
-     * @return a field declaration or null if not found.
-     */
-    @SuppressWarnings("unchecked")
-    public static FieldDeclaration getFieldDeclaration(IField field) {
-        AbstractTypeDeclaration typeDeclaration = getTypeDeclaration(field.getDeclaringType());
-        if (typeDeclaration != null) {
-            List<BodyDeclaration> bodyDeclarations = typeDeclaration.bodyDeclarations();
-            for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
-                if (bodyDeclaration instanceof FieldDeclaration) {
-                    FieldDeclaration fieldDeclaration = (FieldDeclaration) bodyDeclaration;
-                    if (compareFieldNames(fieldDeclaration, field)) {
-                        return fieldDeclaration;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link SingleVariableDeclaration} that corresponds to the given {@link ILocalVariable}.
-     * @param javaElement the local variable
-     * @return a single variable declaration or null if not found.
-     */
-    public static SingleVariableDeclaration getSingleVariableDeclaration(ILocalVariable javaElement) {
-        if (javaElement instanceof ILocalVariable && javaElement.getParent() instanceof IMethod) {
-            ILocalVariable localVariable = javaElement;
-            IMethod method = (IMethod) localVariable.getParent();
-            MethodDeclaration methodDeclaration = getMethodDeclaration(method);
-
-            @SuppressWarnings("unchecked")
-            List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
-            for (SingleVariableDeclaration singleVariableDeclaration : parameters) {
-                if (singleVariableDeclaration.getName().getIdentifier().equals(localVariable.getElementName())) {
-                    return singleVariableDeclaration;
-                }
-            }
-        }
-        return null;
-    }
-
-    private static ChildListPropertyDescriptor getChildListPropertyDescriptorForType(AbstractTypeDeclaration
-            abstractTypeDeclaration) {
-        ChildListPropertyDescriptor childListPropertyDescriptor = null;
-        if (abstractTypeDeclaration instanceof TypeDeclaration) {
-            childListPropertyDescriptor = TypeDeclaration.MODIFIERS2_PROPERTY;
-        }
-        if (abstractTypeDeclaration instanceof EnumDeclaration) {
-            childListPropertyDescriptor = EnumDeclaration.MODIFIERS2_PROPERTY;
-        }
-        if (abstractTypeDeclaration instanceof AnnotationTypeDeclaration) {
-            childListPropertyDescriptor = AnnotationTypeDeclaration.MODIFIERS2_PROPERTY;
-        }
-        return childListPropertyDescriptor;
-    }
-
-    /**
-     * Returns the annotations type name. If the annotation name is a simple name, the result is the
-     * name's identifier. If the name is a qualified name, the result is the name of the qualifier
-     * followed by "." followed by the name's identifier.
-
-     * @param annotation the annotation.
-     * @return the annotation name. The simple name or the fully qualified name.
-     */
-    public static String getAnnotationName(Annotation annotation) {
-        Name annotationTypeName = annotation.getTypeName();
-        return annotationTypeName.getFullyQualifiedName();
-    }
-
-    /**
-     * Compares the {@link AbstractTypeDeclaration} and {@link IType}.
-     * @param abstractTypeDeclaration the type declaration.
-     * @param type the type.
-     * @return <code>true</code> if the names match.
-     */
-    public static boolean compareTypeNames(AbstractTypeDeclaration abstractTypeDeclaration, IType type) {
-        return abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName());
-    }
-
-    /**
-     * Compares the {@link MethodDeclaration} and {@link IMethod}.
-     * @param methodDeclaration the method declaration.
-     * @param method the method.
-     * @return <code>true</code> if the method names and parameter types match.
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean compareMethods(MethodDeclaration methodDeclaration, IMethod method) {
-        if (methodDeclaration.getName().getIdentifier().equals(method.getElementName())) {
-            String[] parametetTypes = method.getParameterTypes();
-            List<SingleVariableDeclaration> methodDeclarationParameters = methodDeclaration.parameters();
-            if (parametetTypes.length == methodDeclarationParameters.size()) {
-                for (int i = 0; i < parametetTypes.length; i++) {
-                    String simpleName1 = Signature.toString(parametetTypes[i]);
-                    String simpleName2 = methodDeclarationParameters.get(i).getType().toString();
-                    if (!simpleName1.equals(simpleName2)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Compares the two {@link MethodDeclaration}.
-     * @param methodOne the first method declaration.
-     * @param methodTwo the second method declaration.
-     * @return <code>true</code> if the method names and parameter types match.
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean compareMethods(MethodDeclaration methodOne, MethodDeclaration methodTwo) {
-        if (methodOne.getName().getIdentifier().equals(methodTwo.getName().getIdentifier())) {
-            List<SingleVariableDeclaration> methodParametersOne = methodOne.parameters();
-            List<SingleVariableDeclaration> methodParametersTwo = methodTwo.parameters();
-            if (methodParametersOne.size() == methodParametersTwo.size()) {
-                for (int i = 0; i < methodParametersOne.size(); i++) {
-                    String simpleName1 = methodParametersOne.get(i).getType().toString();
-                    String simpleName2 = methodParametersTwo.get(i).getType().toString();
-                    if (!simpleName1.equals(simpleName2)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Compares the two {@link com.sun.mirror.declaration.MethodDeclaration}.
-     * @param methodOne the first method declaration.
-     * @param methodTwo the second method declaration.
-     * @return <code>true</code> if the method names and parameter types match.
-     */
-    public static boolean compareMethods(com.sun.mirror.declaration.MethodDeclaration methodOne,
-            com.sun.mirror.declaration.MethodDeclaration methodTwo) {
-        return compareMethodNames(methodOne, methodTwo) && compareMethodParameterTypes(methodOne, methodTwo);
-    }
-
-    private static boolean compareMethodNames(com.sun.mirror.declaration.MethodDeclaration methodOne,
-            com.sun.mirror.declaration.MethodDeclaration methodTwo) {
-        return methodOne.getSimpleName().equals(methodTwo.getSimpleName());
-    }
-
-    private static boolean compareMethodParameterTypes(com.sun.mirror.declaration.MethodDeclaration methodOne,
-            com.sun.mirror.declaration.MethodDeclaration methodTwo) {
-        int numberOfParametersOne = methodOne.getParameters().size();
-        int numberOfParametersTwo = methodTwo.getParameters().size();
-
-        if (numberOfParametersOne == numberOfParametersTwo) {
-            List<ParameterDeclaration> parametersOne = (List<ParameterDeclaration>) methodOne.getParameters();
-            List<ParameterDeclaration> parametersTwo = (List<ParameterDeclaration>) methodTwo.getParameters();
-            for (int i = 0; i < parametersOne.size(); i++) {
-                if (!parametersOne.get(i).getType().equals(parametersTwo.get(i).getType())) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Compares the {@link FieldDeclaration} and {@link IField}.
-     * @param fieldDeclaration the field declaration.
-     * @param field the field.
-     * @return <code>true</code> if the field names match.
-     */
-    @SuppressWarnings("unchecked")
-    public static boolean compareFieldNames(FieldDeclaration fieldDeclaration, IField field) {
-        List<VariableDeclarationFragment> fragments = fieldDeclaration.fragments();
-        for (VariableDeclarationFragment variableDeclarationFragment : fragments) {
-            if (variableDeclarationFragment.getName().getIdentifier().equals(field.getElementName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests the given {@link IMethod} to see if it is an overloaded method. If it is it will return
-     * a string representing the position of this method in it's parents {@link IType}.
-     * <p>
-     * E.g. Given three methods:
-     * <pre>
-     * public void myMethod(...);
-     * public void myMethod(...);
-     * public void myMethod(...);
-     * </pre>
-     * The first method would return a blank string, the second would return the string "1" and the third
-     * would return the string "2".
-     * </p>
-     * @param method the method to test
-     * @return a string value
-     * @exception JavaModelException thrown if an exception occurs while accessing the underlying resource
-     */
-    public static String accountForOverloadedMethods(IMethod method) throws JavaModelException {
-    	IType type = method.getDeclaringType();
-    	if (type == null) {
-    		return "";
-    	}
-        List<IMethod> methods =  Arrays.asList(type.getMethods());
-        List<IMethod> similarMethods = new ArrayList<IMethod>();
-        for (IMethod methodToTest : methods) {
-            if (!method.equals(methodToTest) && method.getElementName().equalsIgnoreCase(
-                    methodToTest.getElementName()) && methodToTest.getSourceRange().getOffset() <
-                    method.getSourceRange().getOffset()) {
-                similarMethods.add(methodToTest);
-            }
-        }
-        return similarMethods.size() > 0 ? Integer.toString(similarMethods.size()) : ""; //$NON-NLS-1$
-    }
-
-    private static boolean compareAnnotationNames(Annotation newAnnotation, Annotation existingAnnotation) {
-        return AnnotationUtils.getAnnotationName(existingAnnotation).equals(
-                AnnotationUtils.getAnnotationName(newAnnotation));
-    }
-
-    /**
-     * Checks if the given {@link Annotation} is present on the {@link IJavaElement}.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the annotation.
-     * @return <code>true</code> if the annotation is present.
-     */
-    public static boolean isAnnotationPresent(IJavaElement javaElement, Annotation annotation) {
-        return AnnotationUtils.isAnnotationPresent(javaElement, AnnotationUtils.getAnnotationName(annotation));
-    }
-
-    /**
-     * Checks if the annotation with the given name is present on the {@link IJavaElement}.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotationName the annotation name.
-     * @return <code>true</code> if the annotation is present.
-     */
-    public static boolean isAnnotationPresent(IJavaElement javaElement, String annotationName) {
-        if (javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
-            return isAnnotationPresent(((ICompilationUnit)javaElement).findPrimaryType(), annotationName);
-        }
-
-        int elementType = javaElement.getElementType();
-
-        if (elementType == IJavaElement.PACKAGE_DECLARATION
-                || elementType == IJavaElement.TYPE
-                || elementType == IJavaElement.METHOD
-                || elementType == IJavaElement.LOCAL_VARIABLE
-                || elementType == IJavaElement.FIELD) {
-
-            List<Annotation> annotations = getAnnotations(javaElement);
-            for (Annotation annotation : annotations) {
-                if (AnnotationUtils.getAnnotationName(annotation).equals(annotationName)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns a list of all the {@link Annotation} that are present on the given {@link IJavaElement}
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @return a list of annotations.
-     */
-    @SuppressWarnings("unchecked")
-    public static List<Annotation> getAnnotations(IJavaElement javaElement) {
-        ICompilationUnit source = AnnotationUtils.getCompilationUnitFromJavaElement(javaElement);
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
-            PackageDeclaration packageDeclaration = compilationUnit.getPackage();
-            return packageDeclaration.annotations();
-        }
-
-
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            IType type = (IType) javaElement;
-            AbstractTypeDeclaration typeDeclaration = AnnotationUtils.getTypeDeclaration(type);
-            return extractAnnotations(typeDeclaration.modifiers());
-        }
-
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            MethodDeclaration methodDeclaration = AnnotationUtils.getMethodDeclaration(method);
-            return extractAnnotations(methodDeclaration.modifiers());
-        }
-
-        if (javaElement.getElementType() == IJavaElement.FIELD) {
-            IField field = (IField) javaElement;
-            FieldDeclaration fieldDeclaration = AnnotationUtils.getFieldDeclaration(field);
-            return extractAnnotations(fieldDeclaration.modifiers());
-        }
-
-        if (javaElement.getElementType() == IJavaElement.LOCAL_VARIABLE) {
-            SingleVariableDeclaration singleVariableDeclaration = getSingleVariableDeclaration((ILocalVariable) javaElement);
-            if (singleVariableDeclaration != null) {
-                return extractAnnotations(singleVariableDeclaration.modifiers());
-            }
-        }
-
-        return Collections.emptyList();
-    }
-
-    private static List<Annotation> extractAnnotations(List<IExtendedModifier> extendedModifiers) {
-        List<Annotation> annotations = new ArrayList<Annotation>();
-        for (IExtendedModifier extendedModifier : extendedModifiers) {
-            if (extendedModifier.isAnnotation()) {
-                annotations.add((Annotation) extendedModifier);
-            }
-        }
-        return annotations;
-    }
-
-    /**
-     * Returns a list of all the {@link SingleVariableDeclaration} for the given {@link IMethod}.
-     * @param method the method.
-     * @return a list of single variable declarations.
-     */
-    @SuppressWarnings("unchecked")
-    public static List<SingleVariableDeclaration> getSingleVariableDeclarations(final IMethod method) {
-        ICompilationUnit source = method.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-        final List<SingleVariableDeclaration> parameters = new ArrayList<SingleVariableDeclaration>();
-        compilationUnit.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(MethodDeclaration methodDeclaration) {
-                if (compareMethods(methodDeclaration, method)) {
-                    parameters.addAll(methodDeclaration.parameters());
-                }
-                return false;
-            }
-        });
-        return parameters;
-    }
-
-    /**
-     * Returns the {@link ILocalVariable} at the given offset position in the source file.
-     * @param method the method in which the local variable is declared.
-     * @param offset the character index of the local variable in the source file.
-     * The offset must be >= to the start position of the node representing the local variable and
-     * <= the nodes start position plus length.
-     * @return the local variable or null if not found.
-     */
-    public static ILocalVariable getLocalVariable(IMethod method, int offset) {
-        List<SingleVariableDeclaration> parameters = getSingleVariableDeclarations(method);
-        for (SingleVariableDeclaration parameter : parameters) {
-            int parameterStartPosition = parameter.getStartPosition();
-            int parameterLength = parameter.getLength();
-            if (offset >= parameterStartPosition
-                    && offset <= parameterStartPosition + parameterLength) {
-                return (ILocalVariable) parameter.resolveBinding().getJavaElement();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link ILocalVariable} with the given name within the declared {@link IMethod}.
-     * @param method the method in which the local variable is declared.
-     * @param paramName the local variable name.
-     * @return the local variable or null if not found.
-     */
-    public static ILocalVariable getLocalVariable(IMethod method, String paramName) {
-        List<SingleVariableDeclaration> parameters = getSingleVariableDeclarations(method);
-        for (SingleVariableDeclaration parameter : parameters) {
-            if (parameter.getName().getIdentifier().equals(paramName)) {
-                return (ILocalVariable) parameter.resolveBinding().getJavaElement();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the AST {@link Annotation} that corresponds to the given {@link java.lang.annotation.Annotation} class
-     * on the {@link IJavaElement}.
-     * @param javaElement one of the following types of java element:
-     * <li>IJavaElement.PACKAGE_DECLARATION</li>
-     * <li>IJavaElement.TYPE</li>
-     * <li>IJavaElement.FIELD</li>
-     * <li>IJavaElement.METHOD</li>
-     * <li>IJavaElement.LOCAL_VARIABLE</li>
-     * @param annotation the {@link java.lang.annotation.Annotation} class.
-     * @return the AST annotation or null if not found.
-     */
-    public static Annotation getAnnotation(IJavaElement javaElement, Class<? extends java.lang.annotation.Annotation> annotation) {
-        List<Annotation> annotations = getAnnotations(javaElement);
-        for (Annotation astAnnotation : annotations) {
-            String typeName = astAnnotation.getTypeName().getFullyQualifiedName();
-            if (typeName.equals(annotation.getCanonicalName())
-                    || typeName.equals(annotation.getSimpleName())) {
-                return astAnnotation;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link AnnotationMirror} that corresponds to the given {@link java.lang.annotation.Annotation} class
-     * on the {@link Declaration}.
-     * @param declaration the declaration
-     * @param annotation the {@link java.lang.annotation.Annotation} class.
-     * @return the annotation mirror or null if not found.
-     */
-    public static AnnotationMirror getAnnotation(Declaration declaration,
-            Class<? extends java.lang.annotation.Annotation> annotation) {
-        Collection<AnnotationMirror> aannotationMirrors = declaration.getAnnotationMirrors();
-
-        for (AnnotationMirror annotationMirror : aannotationMirrors) {
-            com.sun.mirror.declaration.AnnotationTypeDeclaration annotationTypeDeclaration = annotationMirror
-            .getAnnotationType().getDeclaration();
-            if (annotationTypeDeclaration != null
-                    && annotationTypeDeclaration.getQualifiedName().equals(annotation.getCanonicalName())) {
-                return annotationMirror;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the JDT {@link IAnnotation} that corresponds to the given {@link java.lang.annotation.Annotation} class
-     * on the {@link IAnnotatable} element.
-     * @param annotation the {@link java.lang.annotation.Annotation} class.
-     * @param annotatable a package declaration, a type, a method, a field or a local variable in a compilation unit.
-     * @return the annotation or null if not found.
-     * @throws JavaModelException if the annotatable element does not exist or if an exception occurs while accessing its corresponding resource.
-     */
-    public static IAnnotation getAnnotation(Class<? extends java.lang.annotation.Annotation> annotation,
-            IAnnotatable annotatable) throws JavaModelException {
-        IAnnotation[] annotations = annotatable.getAnnotations();
-        for (IAnnotation jdtAnnotation : annotations) {
-            String annotationName = jdtAnnotation.getElementName();
-            if (annotationName.equals(annotation.getCanonicalName())
-                    || annotationName.equals(annotation.getSimpleName())) {
-                return jdtAnnotation;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link AnnotationValue} with the given member name that is declared within the {@link AnnotationMirror}.
-     * @param mirror the annotation mirror.
-     * @param memberName the member name.
-     * @return the annotation value or null if not found.
-     */
-    public static AnnotationValue getAnnotationValue(AnnotationMirror mirror, String memberName) {
-        Map<AnnotationTypeElementDeclaration, AnnotationValue> values = mirror.getElementValues();
-        Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> entrySet = values.entrySet();
-        for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> entry : entrySet) {
-            AnnotationTypeElementDeclaration element = entry.getKey();
-            if (element.getSimpleName().equals(memberName)) {
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link NormalAnnotation} member value pair value with the given member name.
-     * @param normalAnnotation the normal annotation.
-     * @param memberName the member value pair member name.
-     * @return the value expression or null if not found.
-     */
-    @SuppressWarnings("unchecked")
-    public static Expression getAnnotationValue(NormalAnnotation normalAnnotation, String memberName) {
-        List<MemberValuePair> memberValuePairs = normalAnnotation.values();
-        for (MemberValuePair memberValuePair : memberValuePairs) {
-            if (memberValuePair.getName().getIdentifier().equals(memberName)) {
-                return memberValuePair.getValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the JDT {@link IAnnotation} member value pair value with the given member name.
-     * @param annotation the annotation.
-     * @param memberName the member name.
-     * @return an object representing the member value pairs value.
-     * @throws JavaModelException if the annotation does not exist or if an exception occurs while accessing its corresponding resource.
-     */
-    public static Object getAnnotationValue(IAnnotation annotation, String memberName) throws JavaModelException {
-        IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-        if (memberValuePairs.length > 0) {
-            for (IMemberValuePair memberValuePair : memberValuePairs) {
-                if (memberValuePair.getMemberName().equals(memberName)) {
-                    return memberValuePair.getValue();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the {@link MemberValuePair} with the given member name from the {@link NormalAnnotation}.
-     * @param normalAnnotation the normal annotation.
-     * @param memberName the member name of the member value pair to return.
-     * @return a member value pair or null if no member value pair with the given member name can be found.
-     */
-    @SuppressWarnings("unchecked")
-    public static MemberValuePair getMemberValuePair(NormalAnnotation normalAnnotation, String memberName) {
-        List<MemberValuePair> memberValuesPairs = normalAnnotation.values();
-        for (MemberValuePair memberValuePair : memberValuesPairs) {
-            if (memberValuePair.getName().getIdentifier().equals(memberName)) {
-                return memberValuePair;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link AnnotationMirror} as a {@link String} value.
-     * @param mirror the annotation mirror.
-     * @param memberName the member name.
-     * @return the member value as a String or null if no member with the member name can be found.
-     */
-    public static String getStringValue(AnnotationMirror mirror, String memberName) {
-        AnnotationValue annotationValue = getAnnotationValue(mirror, memberName);
-        if (annotationValue != null) {
-            return annotationValue.getValue().toString();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link Annotation} as a {@link String} value.
-     * @param annotation the AST annotation.
-     * @param memberName the member name.
-     * @return the member value as a String or null if no member with the member name can be found.
-     */
-    public static String getStringValue(Annotation annotation, String memberName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
-            if (expression != null && expression instanceof StringLiteral) {
-                return ((StringLiteral) expression).getLiteralValue();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link IAnnotation} as a {@link String} value.
-     * @param annotation the JDT annotation.
-     * @param memberName the member name.
-     * @return the member value as a String or null if no member with the member name can be found.
-     * @throws JavaModelException  if the annotation does not exist or if an exception occurs while accessing
-     * its corresponding resource.
-     */
-    public static String getStringValue(IAnnotation annotation, String memberName) throws JavaModelException {
-        Object value = AnnotationUtils.getAnnotationValue(annotation, memberName);
-        if (value != null) {
-            return value.toString();
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link AnnotationMirror} as a {@link Boolean} value.
-     * @param mirror the annotation mirror.
-     * @param memberName the member name.
-     * @return the member value as a Boolean or null if no member with the member name can be found.
-     */
-    public static Boolean getBooleanValue(AnnotationMirror mirror, String memberName) {
-        String value = getStringValue(mirror, memberName);
-        if (value != null) {
-            return Boolean.valueOf(value);
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link Annotation} as a {@link Boolean} value.
-     * @param annotation the AST annotation.
-     * @param memberName the member name.
-     * @return the member value as a Boolean or null if no member with the member name can be found.
-     */
-    public static Boolean getBooleanValue(Annotation annotation, String memberName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
-            if (expression != null && expression instanceof BooleanLiteral) {
-                return Boolean.valueOf(((BooleanLiteral) expression).booleanValue());
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the  member value with the given member name from the {@link IAnnotation} as a {@link Boolean} value.
-     * @param annotation the JDT annotation.
-     * @param memberName the member name.
-     * @return the member value as a Boolean or null if no member with the member name can be found.
-     * @throws JavaModelException  if the annotation does not exist or if an exception occurs while accessing
-     * its corresponding resource.
-     */
-    public static Boolean getBooleanValue(IAnnotation annotation, String memberName) throws JavaModelException {
-        String value = AnnotationUtils.getStringValue(annotation, memberName);
-        if (value != null) {
-            return Boolean.valueOf(value);
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link Annotation} as a {@link String} value.
-     * The returned String value is the name of the enum constant.
-     * @param annotation the AST annotation.
-     * @param memberName the member name.
-     * @return the member value as a String or null if no member with the member name can be found.
-     */
-    public static String getEnumValue(Annotation annotation, String memberName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, memberName);
-            if (expression != null && expression instanceof QualifiedName) {
-                return ((QualifiedName) expression).getName().getIdentifier();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the member value with the given member name from the {@link IAnnotation} as a {@link String} value.
-     * The returned String value is the name of the enum constant.
-     * @param annotation the JDT annotation.
-     * @param memberName the member name.
-     * @return the member value as a String or null if no member with the member name can be found.
-     * @throws JavaModelException  if the annotation does not exist or if an exception occurs while accessing
-     * its corresponding resource.
-     */
-    public static String getEnumValue(IAnnotation annotation, String memberName) throws JavaModelException {
-        String value = AnnotationUtils.getStringValue(annotation, memberName);
-        if (value != null && value.indexOf(".") != -1) {
-            return value.substring(value.lastIndexOf(".") + 1);
-        }
-        return null;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
deleted file mode 100644
index 298a9b8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.annotations.core.processor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessors;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-public class AnnotationsCoreProcessorFactory implements AnnotationProcessorFactory {
-
-    public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationSet,
-            AnnotationProcessorEnvironment processorEnvironment) {
-
-    	if (annotationSet.size() == 0) {
-    		return AnnotationProcessors.NO_OP;
-    	}
-        List<AnnotationProcessor> annotationProcessors = new ArrayList<AnnotationProcessor>();
-
-        Map<String, List<IConfigurationElement>> annotationProcessorCache =
-            AnnotationsManager.getAnnotationProcessorsCache();
-
-        for (AnnotationTypeDeclaration annotationTypeDeclaration : annotationSet) {
-            List<IConfigurationElement> processorElements = annotationProcessorCache.get(
-                    annotationTypeDeclaration.getQualifiedName());
-
-            for (IConfigurationElement configurationElement : processorElements) {
-                if (configurationElement != null) {
-                    AnnotationProcessor processor = getAnnotationProcessor(configurationElement,
-                            processorEnvironment);
-                    if (processor != null) {
-                        annotationProcessors.add(processor);
-                    }
-                }
-            }
-        }
-
-        return AnnotationProcessors.getCompositeAnnotationProcessor(annotationProcessors);
-    }
-
-    public AnnotationProcessor getAnnotationProcessor(IConfigurationElement configurationElement,
-            AnnotationProcessorEnvironment processorEnvironment) {
-          try {
-              AbstractAnnotationProcessor annotationProcessor =
-                  (AbstractAnnotationProcessor)configurationElement.createExecutableExtension("class");
-              annotationProcessor.setAnnotationProcessorEnvironment(processorEnvironment);
-              return annotationProcessor;
-          } catch (CoreException ce) {
-              AnnotationsCorePlugin.log(ce.getStatus());
-          }
-          return null;
-      }
-
-    public Collection<String> supportedAnnotationTypes() {
-        return AnnotationsManager.getAnnotationProcessorsCache().keySet();
-    }
-
-    public Collection<String> supportedOptions() {
-        return Collections.emptyList();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
deleted file mode 100644
index e59b69c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.consumption.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7894f8b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:52 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 55d6472..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.core;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
deleted file mode 100644
index 7c6cf7c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-WEB_SERVICE_LOCATOR_AXIS=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_AXIS=Apache CXF Components
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
deleted file mode 100644
index 5a3a4b3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension point="org.eclipse.wst.ws.locator">
-      <webServiceLocatorCategory
-         id="ws.locator.category.cxf"
-         label="%WEB_SERVICE_LOCATOR_CATEGORY_CXF"/>
-
-      <webServiceLocator
-         class="org.eclipse.jst.ws.internal.cxf.consumption.core.locator.CXFWebServiceLocator"
-         id="ws.locator.cxf"
-         category="ws.locator.category.cxf"
-         label="WEB_SERVICE_LOCATOR_CXF">
-      </webServiceLocator>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
deleted file mode 100644
index 63eb001..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCoreMessages"; //$NON-NLS-1$
-
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(CXFConsumptionCoreMessages.BUNDLE_NAME, CXFConsumptionCoreMessages.class);
-    }
-
-    private CXFConsumptionCoreMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
deleted file mode 100644
index 5d980bc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
deleted file mode 100644
index e920fe6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- * 
- */
-public class CXFConsumptionCorePlugin extends AbstractUIPlugin {
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.core"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFConsumptionCorePlugin plugin;
-
-    /**
-     * The constructor.
-     */
-    public CXFConsumptionCorePlugin() {
-    }
-    
-    /**
-     * Returns the shared instance.
-     * 
-     * @return the shared instance
-     */
-    public static CXFConsumptionCorePlugin getDefault() {
-        return plugin;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-    
-    public static void logMessage(int severity, String message) {
-        CXFConsumptionCorePlugin.log(new Status(severity, CXFConsumptionCorePlugin.PLUGIN_ID, 
-            message));
-    }
-
-    public static void log(IStatus status) {
-        CXFConsumptionCorePlugin.getDefault().getLog().log(status);
-    }
-
-    public static void log(Throwable exception) {
-        CXFConsumptionCorePlugin.log(new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID, 
-            exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
deleted file mode 100644
index 0b637d7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Executes the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command with the arguments
- * necessary to generate a client.
- *
- */
-public class WSDL2JavaClientCommand extends AbstractDataModelOperation {
-    public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
-    private WSDL2JavaDataModel model;
-
-    private JavaResourceChangeListener javaResourceChangeListener;
-
-    /**
-     * Constructs a <code>WSDL2JavaClientCommand</code> object.
-     * @param model the <code>WSDL2JavaDataModel</code> used to pass information
-     * between commands.
-     */
-    public WSDL2JavaClientCommand(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        javaResourceChangeListener = new JavaResourceChangeListener(new Path(model.getJavaSourceFolder()));
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-
-        String[] progArgs = CommandLineUtils.getWSDL2JavaGenerateClientArguments(model);
-
-        try {
-            String projectName = model.getProjectName();
-
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            LaunchUtils.launch(javaProject, WSDL2JavaClientCommand.CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyW2JFilesFromTmp(this.model);
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFConsumptionCorePlugin.log(status);
-        }
-
-        ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-        return status;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFConsumptionCorePlugin.log(status);
-                }
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
deleted file mode 100644
index d66e388..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Loads the <code>WSDL2JavaDataModel</code> with the persisted defaults
- * from the preferences and with the initial runtime information such as the
- * starting point WSDL URL.
- *
- */
-public class WSDL2JavaClientDefaultingCommand extends AbstractDataModelOperation {
-    private WSDL2JavaDataModel model;
-    private String projectName;
-    private String inputURL;
-
-    /**
-     * Constructs a WSDL2JavaClientDefaultingCommand object.
-     * @param model the <code>WSDL2JavaDataModel</code> used to pass information
-     *              between commands.
-     */
-    public WSDL2JavaClientDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
-        this.model = model;
-        this.projectName = projectName;
-        this.inputURL = inputURL;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-    	IStatus status = Status.OK_STATUS;
-        WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-        model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-        model.setProjectName(projectName);
-
-        model.setIncludedNamespaces(new HashMap<String, String>());
-        model.setExcludedNamespaces(new HashMap<String, String>());
-
-        // XJC
-        model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
-        model.setXjcToString(context.isXjcToString());
-        model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
-        model.setXjcToStringSimple(context.isXjcToStringSimple());
-        model.setXjcLocator(context.isXjcLocator());
-        model.setXjcSyncMethods(context.isXjcSyncMethods());
-        model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
-        model.setValidate(context.isValidate());
-        model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
-        model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
-        model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
-        model.setUseDefaultValues(context.isUseDefaultValues());
-        model.setNoAddressBinding(context.isNoAddressBinding());
-        model.setAutoNameResolution(context.isAutoNameResolution());
-
-        model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()).toOSString());
-
-    	try {
-    		URL wsdlUrl = new URL(inputURL);
-			model.setWsdlURL(wsdlUrl);
-
-			Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
-        	if (definition != null) {
-        		String targetNamespace = definition.getTargetNamespace();
-        		String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
-        		model.setTargetNamespace(targetNamespace);
-        		model.getIncludedNamespaces().put(targetNamespace, packageName);
-
-                String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
-                if (wsdlLocation != null) {
-                    model.setWsdlLocation(wsdlLocation);
-                }
-
-        		model.setWsdlDefinition(definition);
-        	}
-
-		} catch (MalformedURLException murle) {
-		    status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
-		            murle.getLocalizedMessage());
-			CXFConsumptionCorePlugin.log(status);
-		} catch (IOException ioe) {
-		    status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID,
-		    		ioe.getLocalizedMessage());
-			CXFConsumptionCorePlugin.log(status);
-		}
-        return status;
-    }
-
-    public WSDL2JavaDataModel getWSDL2JavaDataModel() {
-        return model;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
deleted file mode 100644
index a150dea..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/locator/CXFWebServiceLocator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.locator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceLocator extends AbstractWebServiceLocator {
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List getWebServiceClients(IProgressMonitor monitor) {
-        return super.getWebServiceClients(monitor);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List getWebServiceClients(IProject[] projects, IProgressMonitor monitor) {
-        return super.getWebServiceClients(projects, monitor);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List getWebServices(IProgressMonitor monitor) {
-        IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-        return getWebServices(projects, monitor);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List getWebServices(IProject[] projects, IProgressMonitor monitor) {
-        List webServices = new ArrayList();
-        for (IProject project : projects) {
-            if (J2EEUtils.isWebComponent(project)) {
-                webServices.addAll(getWebServicesFromProject(project));
-            }
-        }
-        return webServices;
-    }
-
-    @SuppressWarnings("unchecked")
-    private List getWebServicesFromProject(IProject project) {
-        return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
deleted file mode 100644
index f8721ed..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.consumption.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fc358c6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:53 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cc21552..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws.cxf.consumption.core;bundle-version="0.3.4",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
deleted file mode 100644
index 5ade88b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 3c0d1b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-  <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-    <webServiceImpl
-            id="org.eclipse.jst.ws.cxf.wsImpl.java"
-            label="%JAXWS_WEBSERVICETYPE"
-            resourceTypeMetadata="File IResource CompilationUnit"
-            extensionMetadata=".java .class"
-            objectSelectionWidget="org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
-            mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
-    </webServiceImpl>
-   </extension>
-   
-   <!--<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
-      <webServiceClientImpl
-            id="org.eclipse.jst.ws.cxf.client.type.java"
-            label="%JAXWS_CLIENT">
-      </webServiceClientImpl>
-   </extension>-->
-   
-   <extension point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class=" org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.CXFJAXWSSelectionLaunchable"
-            external_modify="true"
-            id=" org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object.JAXWSSelectionTransformer">
-      </objectSelectionWidget>
-   </extension>
-   
-   <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.WSDL2JavaClientConfigWidgetFactory"
-             id="WSDL2JavaClientConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand">
-       </widgetFactory>
-   </extension>
-   
-  </plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
deleted file mode 100644
index 5f847b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFConsumptionUIMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages"; //$NON-NLS-1$
-    public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE;
-    public static String CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE;
-    
-    public static String WSDL2JAVA_CLIENT_PAGE_TITLE;
-    public static String WSDL2JAVA_CLIENT_PAGE_DESCRIPTION;
-    
-    public static String WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE;
-    public static String WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION;
-    
-    public static String WSDL2JAVA_GROUP_LABEL;
-    public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-    
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(CXFConsumptionUIMessages.BUNDLE_NAME, CXFConsumptionUIMessages.class);
-    }
-
-    private CXFConsumptionUIMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
deleted file mode 100644
index 9406b55..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE=Browse Workspace Classes and Interfaces
-CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE=Select the Java Class or Interface which will be used to create the Web Service
-
-#WSDL2Java Client Congih Widget Factory
-WSDL2JAVA_CLIENT_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Client Configuration
-WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Client Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
deleted file mode 100644
index 269b5e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- */
-public class CXFConsumptionUIPlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.consumption.ui"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFConsumptionUIPlugin plugin;
-
-    /**
-     * The constructor
-     */
-    public CXFConsumptionUIPlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFConsumptionUIPlugin getDefault() {
-        return plugin;
-    }
-
-    public static void logMessage(int severity, String message) {
-        CXFConsumptionUIPlugin.log(new Status(severity, CXFConsumptionUIPlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFConsumptionUIPlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFConsumptionUIPlugin.log(new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, 
-            exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
deleted file mode 100644
index 053d1d9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/CXFJAXWSSelectionLaunchable.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.AbstractObjectSelectionLaunchable;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-@SuppressWarnings("restriction")
-public class CXFJAXWSSelectionLaunchable extends AbstractObjectSelectionLaunchable {
-    private IStatus validationStatus = Status.OK_STATUS;
-    
-    private IProject project;
-    private String serverComponentName;
-    private String className = "";
-    
-    @Override
-    public void setInitialSelection(IStructuredSelection initialSelection) {
-        if (initialSelection != null && !initialSelection.isEmpty()) {
-            Object firstElement = initialSelection.getFirstElement();
-            if (firstElement instanceof String) {
-                className = firstElement.toString();
-            }
-        }
-    }
-
-    @Override
-    public int launch(Shell shell) {
-        IStatus status = Status.OK_STATUS;
-        ElementTreeSelectionDialog selectionDialog = new ElementTreeSelectionDialog(shell,
-                new JavaElementLabelProvider(), new StandardJavaElementContentProvider());
-        selectionDialog.setTitle(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_TITLE);
-        selectionDialog
-                .setMessage(CXFConsumptionUIMessages.CXFJAXWSSELECTIONLAUNCHABLE_SELECTION_DIALOG_MESSAGE);
-        selectionDialog.setAllowMultiple(false);
-        selectionDialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace().getRoot()));
-        selectionDialog.addFilter(new JavaViewerFilter());
-
-        selectionDialog.setValidator(new JavaSelectionStatusValidator());
-
-        int returnCode = selectionDialog.open();
-        if (returnCode == Window.OK) {
-            ICompilationUnit selectedCompilationUnit = (ICompilationUnit) selectionDialog.getFirstResult();
-            IType type = selectedCompilationUnit.findPrimaryType();
-            className = type.getFullyQualifiedName();
-            try {
-                IResource typeResource = type.getUnderlyingResource();
-                if (typeResource != null) {
-                    this.project = typeResource.getProject();
-                    IVirtualComponent comp = ResourceUtils.getComponentOf(typeResource);
-                    if (comp != null) {
-                        serverComponentName = comp.getName();
-                    }
-                } else {
-                    project = null;
-                    serverComponentName = null;
-                }
-                return status.getSeverity();
-            } catch (JavaModelException jme) {
-                project = null;
-                serverComponentName = null;
-                status = jme.getStatus();
-                CXFConsumptionUIPlugin.log(status);
-                return status.getSeverity();
-            }
-        }
-
-        return IStatus.CANCEL;
-    }
-
-    @Override
-    public IStructuredSelection getObjectSelection() {
-        return new StructuredSelection(className);
-    }
-
-    public String getComponentName() {
-        return serverComponentName;
-    }
-
-    public IProject getProject() {
-            ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getSelectionService();
-            ISelection selection = selectionService.getSelection();
-            
-            if (selection != null && !selection.isEmpty() && selection instanceof TreeSelection) {
-                TreeSelection treeSelection = (TreeSelection) selection;
-                Object firstElement = treeSelection.getFirstElement();
-                if (firstElement instanceof ICompilationUnit) {
-                    ICompilationUnit compilationUnit = (ICompilationUnit) firstElement;
-                    project = compilationUnit.getResource().getProject();
-                }
-            }
-        return project;
-    }
-
-    @Override
-    public IStatus validateSelection(IStructuredSelection objectSelection) {
-        return validationStatus;
-    }
-
-    @Override
-    public String getObjectSelectionDisplayableString() {
-        return className;
-    }
-
-    @Override
-    public boolean validate(String stringToValidate) {
-        className = stringToValidate;
-
-        IProject project = getProject();
-        if (project != null) {
-            validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-        } else {
-            validationStatus = JDTUtils.validateJavaTypeName(className);
-        }
-
-//        IProject project = getProject();
-//        if (project != null) {
-//            IType type = JDTUtils.getType(project, className);
-//            if (type == null || !type.exists()) {
-//                validationStatus = new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, "");
-//            } else {
-//                validationStatus = JDTUtils.validateJavaTypeName(project.getName(), className);
-//            }
-//            return validationStatus.isOK();
-//        }
-        return validationStatus.isOK();
-    }
-    
-    private static class JavaViewerFilter extends ViewerFilter {
-        @Override
-        public boolean select(Viewer viewer, Object parentElement, Object element) {
-            try {
-                if (element instanceof IJavaProject) {
-                    return true;
-                }
-                if (element instanceof IPackageFragmentRoot) {
-                    IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot) element;
-                    return packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE;
-                }
-                if (element instanceof IPackageFragment) {
-                    IPackageFragment packageFragment = (IPackageFragment) element;
-                    return packageFragment.hasChildren();
-                }
-                if (element instanceof ICompilationUnit) {
-                    ICompilationUnit compilationUnit = (ICompilationUnit) element;
-                    IType type = compilationUnit.findPrimaryType();
-                    return type.isClass() || type.isInterface();
-
-                }
-            } catch (JavaModelException jme) {
-                CXFConsumptionUIPlugin.log(jme.getStatus());
-            }
-            return false;
-        }
-    }
-    
-    private static class JavaSelectionStatusValidator implements ISelectionStatusValidator {
-        public IStatus validate(Object[] selection) {
-            if (selection.length == 1) {
-                if (selection[0] instanceof ICompilationUnit) {
-                    return new Status(IStatus.OK, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-                }
-            }
-            return new Status(IStatus.ERROR, CXFConsumptionUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
deleted file mode 100644
index 84d09c4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidget extends SimpleWidgetDataContributor {
-    private IStatus status = Status.OK_STATUS;
-    private Listener statusListener;
-
-    private WSDL2JavaDataModel model;
-
-    private Composite namespaceCompositeHolder;
-    private Composite namespaceComposite;
-    private int namespaceCompositeHeight = -1;
-
-    public WSDL2JavaClientConfigWidget() {
-    }
-
-    public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-    
-    @Override
-    public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
-        this.statusListener = statusListener;
-
-        final Composite mainComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(3, false);
-        mainComposite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        mainComposite.setLayoutData(gridData);
-
-        // Output Dir
-        WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
-        Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        outputDirCombo.setLayoutData(gridData);
-
-        // Package Name:
-        WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
-        final Text packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        packageNameText.setLayoutData(gridData);
-
-        packageNameText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                String packageName = packageNameText.getText();
-                status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
-                statusListener.handleEvent(null);
-            }
-        });
-
-        final Button namespaceMappingButton = WSDL2JavaWidgetFactory
-                .createNamespacePackageMappingButton(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 3;
-        namespaceMappingButton.setLayoutData(gridData);
-        namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                if (namespaceMappingButton.getSelection()) {
-                    if (namespaceComposite == null) {
-                        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-                        gridData.horizontalSpan = 3;
-                        gridData.verticalSpan = 7;
-                        namespaceCompositeHolder.setLayoutData(gridData);
-                        namespaceCompositeHolder.pack();
-
-                        namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
-                        if (namespaceCompositeHeight == -1) {
-                            Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
-                            namespaceCompositeHeight = groupSize.y;
-                        }
-                        Shell shell = parent.getShell();
-                        Point shellSize = shell.getSize();
-                        shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
-                        namespaceCompositeHolder.layout();
-                    }
-                } else {
-                    if (namespaceComposite != null) {
-                        GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-                        gridData.horizontalSpan = 3;
-                        namespaceCompositeHolder.setLayoutData(gridData);
-                        namespaceCompositeHolder.pack();
-                        namespaceComposite.dispose();
-                        namespaceComposite = null;
-                        namespaceCompositeHolder.layout();
-                        Shell shell = parent.getShell();
-                        Point shellSize = shell.getSize();
-                        shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
-                    }
-                }
-            }
-        });
-
-        namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
-        gridLayout = new GridLayout(1, true);
-        namespaceCompositeHolder.setLayout(gridLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.horizontalSpan = 3;
-        namespaceCompositeHolder.setLayoutData(gridData);
-
-        // Service Name:
-//        WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
-//
-//        Combo serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
-//        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-//        gridData.horizontalSpan = 2;
-//        serviceNameCombo.setLayoutData(gridData);
-
-        Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.verticalSpan = 3;
-        bindingFilesLabel.setLayoutData(gridData);
-
-        List bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.verticalSpan = 3;
-        bindingFilesList.setLayoutData(gridData);
-
-        Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
-                bindingFilesList);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        addBindingFileButton.setLayoutData(gridData);
-
-        Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
-                model, bindingFilesList);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        removeBindingFileButton.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
-        /*
-        WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
-        Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xmlCatalogText.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
-         */
-        return this;
-    }
-
-    public Table createNamespaceMappingTable(Composite parent) {
-        TableViewer packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
-                | SWT.FULL_SELECTION);
-
-        final Table packageNameTable = packageNameTableViewer.getTable();
-        packageNameTable.setLinesVisible(true);
-        packageNameTable.setHeaderVisible(true);
-
-        TableLayout tableLayout = new TableLayout();
-        packageNameTable.setLayout(tableLayout);
-
-        WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
-        ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
-                packageNameTableViewer, model);
-
-        TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
-        textCellEditor.addListener( new ICellEditorListener() {
-		
-			public void editorValueChanged(boolean oldValidState, boolean newValidState) {
-				statusListener.handleEvent(null);				
-			}
-		
-			public void cancelEditor() {
-			}
-		
-			public void applyEditorValue() {
-			}
-		});
-        
-        textCellEditor.setValidator(new ICellEditorValidator() {
-		
-			public String isValid(Object packageName) {
-	            status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
-	            if (status.getSeverity() == IStatus.OK) {
-	                return null;
-	            }
-	            return status.getMessage();
-			}
-		});
-
-        packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
-        		textCellEditor, model));
-
-        columnWeightData = new ColumnWeightData(100, 100, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
-        packageNameTableViewer.setInput(model.getWsdlDefinition());
-
-        TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
-        for (int i = 0; i < tableItems.length; i++) {
-            TableItem tableItem = tableItems[i];
-            if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
-                tableItem.setChecked(true);
-            }
-        }
-        return packageNameTable;
-    }
-
-    private Composite getNamespaceMappingComposite(Composite parent) {
-        namespaceComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(1, true);
-        namespaceComposite.setLayout(gridLayout);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        namespaceComposite.setLayoutData(gridData);
-
-        Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        packageNameTable.setLayoutData(gridData);
-
-        return namespaceComposite;
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return status;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index e76d373..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-    private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
-    private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
-    private WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget();
-    private WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget = new WSDL2JavaClientDefaultsConfigWidget();
-
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if ((wsdl2JavaClientWidgetContributor == null
-                || wsdl2JavaClientDefaultsWidgetContributor == null)) {
-            init();
-        }
-        return wsdl2JavaClientWidgetContributor;
-    }
-
-    public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-        if (widgetContributor == wsdl2JavaClientWidgetContributor) {
-            return wsdl2JavaClientDefaultsWidgetContributor;
-        }
-        return null;
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(WSDL2JavaClientDefaultingCommand.class,
-                "WSDL2JavaDataModel", WSDL2JavaClientConfigWidgetFactory.class); //$NON-NLS-1$
-    }
-
-    public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
-        wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
-        wsdl2JavaClientDefaultsConfigWidget.setWSDL2JavaDataModel(model);
-    }
-
-    private void init() {
-        wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
-                CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
-                        context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
-        wsdl2JavaClientWidgetContributor
-                .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
-        wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaConfigWidget;
-            }
-        });
-        
-        wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
-        String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
-        CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
-                context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        wsdl2JavaClientDefaultsWidgetContributor.setTitle(wsdl2JavaClientDefaultsPageTitle);
-        wsdl2JavaClientDefaultsWidgetContributor
-                .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION);
-        wsdl2JavaClientDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaClientDefaultsConfigWidget;
-            }
-        });
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
deleted file mode 100644
index 69a7d75..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-    
-    private WSDL2JavaDataModel model;
-    
-    public WSDL2JavaClientDefaultsConfigWidget() {
-    }
-    
-    public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
-        final Composite mainComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(1, false);
-        mainComposite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        mainComposite.setLayoutData(gridData);
-
-        Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
-        wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
-        GridLayout wsdl2javalayout = new GridLayout(1, true);
-        wsdl2javaGroup.setLayout(wsdl2javalayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdl2javaGroup.setLayoutData(gridData);
-
-//        WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
-        WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
-        if (CXFModelUtils.isAutoNameResolutionPermitted()) {
-            WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
-        }
-        
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
-        }
-        
-        Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
-        xjcArgGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
-        GridLayout xjcArgLayout = new GridLayout(1, true);
-        xjcArgGroup.setLayout(xjcArgLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xjcArgGroup.setLayoutData(gridData);
-
-        Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        xjcArgsTable.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
-        return this;
-    }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
deleted file mode 100644
index 2417e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-@SuppressWarnings("restriction")
-public class JAXWSSelectionTransformer implements Transformer {
-
-    public Object transform(Object value) {
-        if (value instanceof IStructuredSelection) {
-            IStructuredSelection structuredSelection = (IStructuredSelection) value;
-            Object selection = structuredSelection.getFirstElement();
-            if (selection instanceof IFile) {
-                IFile file = (IFile) selection;
-                String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
-                return new StructuredSelection(fullyQualifiedJavaName);
-            } else if (selection instanceof ICompilationUnit) {
-                IResource resource = ((ICompilationUnit) selection).getResource();
-                if (resource instanceof IFile) {
-                    IFile file = (IFile) resource;
-                    String fullyQualifiedJavaName = this.getFullyQualifiedJavaName(file);
-                    return new StructuredSelection(fullyQualifiedJavaName);
-                }
-            }
-            if (selection instanceof String) {
-                return structuredSelection;
-            }
-        }
-        return value;
-    }
-
-    private String getFullyQualifiedJavaName(IFile resource) {
-        IProject project = resource.getProject();
-
-        IPath path = resource.getFullPath();
-
-        if (path.getFileExtension() != null) {
-            path = path.removeFileExtension();
-        }
-
-        String javaFileName = path.lastSegment();
-
-        if (path.isAbsolute()) {
-            try {
-                IPath javaFolderPath = path.removeLastSegments(1);
-                IPackageFragment packageFragment = JavaCore.create(project).findPackageFragment(
-                        javaFolderPath);
-                return packageFragment.getElementName() + "." + javaFileName; //$NON-NLS-1$
-            } catch (JavaModelException jme) {
-                CXFConsumptionUIPlugin.log(jme.getStatus());
-            }
-        }
-        return javaFileName;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
deleted file mode 100644
index 84086c2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/wsrt/CXFWebServiceClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: 
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand;
-import org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-
-@SuppressWarnings("restriction")
-public class CXFWebServiceClient extends AbstractWebServiceClient {
-
-    public CXFWebServiceClient(WebServiceClientInfo info) {
-        super(info);
-    }
-
-    @Override
-    public ICommandFactory assemble(IEnvironment env, IContext ctx, ISelection sel, String project,
-            String earProject) {
-        return null;
-    }
-
-    @Override
-    public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel, String project,
-            String earProject) {
-        return null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel, String projectName,
-            String earProject) {
-
-        Vector commands = new Vector();
-
-        WSDL2JavaDataModel wsdl2JavaModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
-        commands.add(new WSDL2JavaClientDefaultingCommand(wsdl2JavaModel, projectName, 
-        		getWebServiceClientInfo().getWsdlURL()));
-        commands.add(new WSDL2JavaClientCommand(wsdl2JavaModel));
-
-        return new SimpleCommandFactory(commands);
-    }
-
-    @Override
-    public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel, String project,
-            String earProject) {
-        return null;
-    }
-
-    @Override
-    public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel, String project,
-            String earProject) {
-        return null;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.core/.classpath
deleted file mode 100644
index e328083..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-    <classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/.project b/bundles/org.eclipse.jst.ws.cxf.core/.project
deleted file mode 100644
index 9e02324..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c4e8e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:54 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b81dd3c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.core;singleton:=true
-Bundle-Version: 0.4.3.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.core;
-  x-friends:="org.eclipse.jst.ws.cxf.ui,
-   org.eclipse.jst.ws.cxf.consumption.ui,
-   org.eclipse.jst.ws.cxf.creation.core,
-   org.eclipse.jst.ws.cxf.creation.ui,
-   org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.context;x-friends:="org.eclipse.jst.ws.cxf.ui,org.eclipse.jst.ws.cxf.creation.core,org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model;
-  x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,
-   org.eclipse.jst.ws.cxf.creation.core,
-   org.eclipse.jst.ws.cxf.ui,
-   org.eclipse.jst.ws.cxf.creation.ui,
-   org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model.impl;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.core.resources;x-friends:="org.eclipse.jst.ws.cxf.creation.core,org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.utils;
-  x-friends:="org.eclipse.jst.ws.cxf.ui,
-   org.eclipse.jst.ws.cxf.consumption.ui,
-   org.eclipse.jst.ws.cxf.creation.core,
-   org.eclipse.jst.ws.cxf.creation.ui,
-   org.eclipse.jst.ws.cxf.consumption.core"
-Require-Bundle: org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- org.jdom;version="1.0.0",
- org.jdom.input;version="1.0.0",
- org.jdom.output;version="1.0.0"
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.html b/bundles/org.eclipse.jst.ws.cxf.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.ini b/bundles/org.eclipse.jst.ws.cxf.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About" 
-# dialog (translated).  Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings b/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.properties b/bundles/org.eclipse.jst.ws.cxf.core/about.properties
deleted file mode 100644
index f89916e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.core/build.properties
deleted file mode 100644
index a47ba23..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               jmerger/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif b/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif
deleted file mode 100644
index a598f60..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/icons/view16/console_view.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml b/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml
deleted file mode 100644
index 202dd30..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/jmerger/merge.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Merge rules used by JMerger -->
-<merge:options 
-	xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
-	
-	<!-- if target is generated, transfer -->
-    <!-- change to sourceMarkup if the source is the standard -->
-    <merge:pull 
-        sourceGet="Method/getBody"
-        sourceTransfer="(\s*//\s*begin-user-code.*?//\s*end-user-code\s*)\n"
-        targetPut="Method/setBody"/>
-	
-	<merge:pull 
-		sourceGet="Method/getReturnType" 
-		targetPut="Method/setReturnType"/>
-	<merge:pull 
-		sourceGet="Method/getExceptions" 
-		targetPut="Method/addException"/>
-	
-    <merge:pull
-      sourceGet="Member/getComment"
-      targetPut="Member/setComment"/>
-    <merge:pull
-       sourceGet="Import/getName"
-       targetPut="Import/setName"/>
-    <merge:pull
-       sourceGet="CompilationUnit/getHeader"
-       targetPut="CompilationUnit/setHeader"/>
-
-<!-- Merge rules to handle annotation:
-	- With this pull rule, annotations in the target is replaced by annotations of the 
-	same name in the source.
-	- With this sweep rule, any annotation in the target that is not available in the 
-  	source is commented out. 
-  	- By default, any annotation in the source that is not in the target are pulled into the target.
--->
-
-	<merge:pull 
-    	sourceGet="Annotation/getContents"
-    	targetPut="Annotation/setContents"/>
-   
-  	<merge:sweep select="Annotation" action="comment"/>
-		
-</merge:options>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
deleted file mode 100644
index ad3e302..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore" nsPrefix="org.eclipse.jst.ws.internal.cxf.core.model">
-  <eClassifiers xsi:type="ecore:EClass" name="CXFContext" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeEdition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verbose" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateAntBuildFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateClient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateServer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="databinding" eType="#//DataBinding"
-        defaultValueLiteral="jaxb"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="frontend" eType="#//Frontend"
-        defaultValueLiteral="jaxws"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useSpringApplicationContext"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exportCXFClasspathContainer"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CXFDataModel" abstract="true" eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlFileName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlURL" eType="#//URL"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configWsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaClassName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaInterfaceName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endpointName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlDefinition" eType="#//Definition"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Java2WSContext" abstract="true" interface="true"
-      eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soap12Binding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateXSDImports" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWSDL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWrapperFaultBeans"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationProcessingEnabled"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebMethodAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebParamAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateRequestWrapperAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateResponseWrapperAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Java2WSDataModel" eSuperTypes="#//CXFDataModel #//Java2WSContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classpath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaStartingPoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useServiceEndpointInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extractInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceEndpointInterfaceName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodMap">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="#//IMethod"/>
-        <eTypeArguments eClassifier="#//Map">
-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-        </eTypeArguments>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationMap">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaContext" abstract="true" interface="true"
-      eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateImplementation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="processSOAPHeaders" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultNamespacePackageNameMapping"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultExcludesNamepsaceMapping"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="1.1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="noAddressBinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcUseDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringMultiLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringSimple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcLocator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcSyncMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcMarkGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcEpisodeFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoNameResolution" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaDataModel" eSuperTypes="#//CXFDataModel #//WSDL2JavaContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includedNamespaces">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bindingFiles" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludedNamespaces">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalogFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaSourceFolder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Frontend">
-    <eLiterals name="JAXWS" literal="jaxws"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="DataBinding">
-    <eLiterals name="JAXB" literal="jaxb"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="URL" instanceClassName="java.net.URL"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Definition" instanceClassName="javax.wsdl.Definition"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Map" instanceClassName="java.util.Map">
-    <eTypeParameters name="T"/>
-    <eTypeParameters name="T1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IMethod" instanceClassName="org.eclipse.jdt.core.IMethod"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
deleted file mode 100644
index bc323f6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram 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" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_yrUN0eukEd2pfImT1jT7vQ" type="Ecore" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_zJtaAOukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LAOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LAeukEd2pfImT1jT7vQ" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_zS81kOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeLocation"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81keukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81kuukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeEdition"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81k-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81lOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeVersion"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81leukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81luukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/verbose"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81l-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81mOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateAntBuildFile"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81meukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81muukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateClient"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81m-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81nOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateServer"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81neukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81nuukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/databinding"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81n-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81oOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/frontend"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81oeukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81ouukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/useSpringApplicationContext"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81o-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_-IhwoOunEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/exportCXFClasspathContainer"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-IhwoeunEd2pfImT1jT7vQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LA-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LBOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LBeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LBuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LB-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LCOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LCeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LCuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LC-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LDOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJtaAeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJtaAuukEd2pfImT1jT7vQ" x="465" y="15"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LDeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LEOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LEeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LEuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LE-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LFOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LFeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LFuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LF-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LGOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LGeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LGuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LG-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LHOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LDuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LD-ukEd2pfImT1jT7vQ" x="465" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LHeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LIOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LIeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LIuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LI-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LJOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LJeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LJuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LJ-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LKOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LKeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LKuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LK-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LLOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LHuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LH-ukEd2pfImT1jT7vQ" x="185" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LLeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LMOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LMeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LMuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LM-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LNOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LNeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LNuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LN-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LOOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAU8OukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU8eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU8uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU8-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LLuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LL-ukEd2pfImT1jT7vQ" x="230" y="620"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAU9OukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zKAU9-ukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAU-OukEd2pfImT1jT7vQ" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_cwezIB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/generateImplementation"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwezIR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwezIh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/processSOAPHeaders"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaMR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultNamespacePackageNameMapping"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaMx92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultExcludesNamepsaceMapping"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaNB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaNR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/validate"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBQR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/wsdlVersion"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBQx92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/useDefaultValues"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBRR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcArgs"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgoUB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/noAddressBinding"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgoUh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcUseDefaultValues"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPYB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToString"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPYh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringMultiLine"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPZB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringSimple"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPZR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2cB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcLocator"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2ch92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcSyncMethods"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2dB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcMarkGenerated"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2dR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwidgB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcEpisodeFile"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwidgR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_jVh0gB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/autoNameResolution"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jVh0gR92Ed6I5swlrsn37g"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU-eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU-uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU--ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAU_OukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU_eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU_uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU_-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVAOukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVAeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVA-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAU9eukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAU9uukEd2pfImT1jT7vQ" x="725" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVBOukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zKAVB-ukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVCOukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVCeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVCuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVC-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVDOukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVDeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVDuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVD-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVEOukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVEeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVEuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVE-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVBeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVBuukEd2pfImT1jT7vQ" x="750" y="670"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVFOukEd2pfImT1jT7vQ" type="2005">
-    <children xmi:type="notation:Node" xmi:id="_zKAVF-ukEd2pfImT1jT7vQ" type="5005"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVGOukEd2pfImT1jT7vQ" type="7011">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVGeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVGuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVG-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVHOukEd2pfImT1jT7vQ" type="7012">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVHeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVHuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVH-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVFeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EEnum" href="CXF.ecore#//Frontend"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVFuukEd2pfImT1jT7vQ" x="735" y="15" width="91"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVIOukEd2pfImT1jT7vQ" type="2005">
-    <children xmi:type="notation:Node" xmi:id="_zKAVI-ukEd2pfImT1jT7vQ" type="5005"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVJOukEd2pfImT1jT7vQ" type="7011">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVJeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVJuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVJ-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVKOukEd2pfImT1jT7vQ" type="7012">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVKeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVKuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVK-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVIeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EEnum" href="CXF.ecore#//DataBinding"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVIuukEd2pfImT1jT7vQ" x="735" y="75" width="91"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVLOukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKAVL-ukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVMOukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVMeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVMuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVM-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVLeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//URL"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVLuukEd2pfImT1jT7vQ" x="185" y="15" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVNOukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKF8OukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKF8eukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF8uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF8-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF9OukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVNeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//Definition"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVNuukEd2pfImT1jT7vQ" x="185" y="60" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKKF9eukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKF-OukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKF-eukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF-uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF--ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF_OukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF9uukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//Map"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF9-ukEd2pfImT1jT7vQ" x="185" y="110" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKKF_eukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKGAOukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKGAeukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKGAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKGA-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKGBOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF_uukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//IMethod"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF_-ukEd2pfImT1jT7vQ" x="185" y="155" width="76"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_yrUN0uukEd2pfImT1jT7vQ"/>
-  <element xmi:type="ecore:EPackage" href="CXF.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_zUl0UOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LDeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zUl0UeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zUl0UuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zUl0U-ukEd2pfImT1jT7vQ" points="[4, -1, 1, 73]$[4, -73, 1, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9COukEd2pfImT1jT7vQ" id="(0.46,0.007490637)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CeukEd2pfImT1jT7vQ" id="(0.5027027,0.9852217)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgQOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LHeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgQeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgQuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgQ-ukEd2pfImT1jT7vQ" points="[0, 1, -41, 318]$[41, -317, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AOukEd2pfImT1jT7vQ" id="(0.8995816,0.04278075)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AeukEd2pfImT1jT7vQ" id="(0.10810811,0.9950739)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgROukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgReukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgRuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgR-ukEd2pfImT1jT7vQ" points="[0, 0, -60, -120]$[60, 120, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CuukEd2pfImT1jT7vQ" id="(0.90816325,0.0053475937)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9C-ukEd2pfImT1jT7vQ" id="(0.255,0.98876405)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgSOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LHeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgSeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgSuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgS-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 62]$[60, -61, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DOukEd2pfImT1jT7vQ" id="(0.3877551,0.0053475937)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DeukEd2pfImT1jT7vQ" id="(0.51046026,0.98930484)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgTOukEd2pfImT1jT7vQ" type="4004" source="_zKAU9OukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgTeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgTuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgT-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 301]$[60, -300, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BuukEd2pfImT1jT7vQ" id="(1.0,0.4984127)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9B-ukEd2pfImT1jT7vQ" id="(0.84864867,0.9655172)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgUOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgUeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgUuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgU-ukEd2pfImT1jT7vQ" points="[-56, -30, 374, 202]$[-265, -143, 165, 89]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AuukEd2pfImT1jT7vQ" id="(0.055172414,0.008130081)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9A-ukEd2pfImT1jT7vQ" id="(0.0,0.6666667)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgVOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zKAU9OukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgVeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgVuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgV-ukEd2pfImT1jT7vQ" points="[0, 0, -111, 0]$[111, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BOukEd2pfImT1jT7vQ" id="(0.5862069,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BeukEd2pfImT1jT7vQ" id="(0.4029304,0.9936508)"/>
-  </edges>
-</notation:Diagram>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
deleted file mode 100644
index 39df3b9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008 IONA Technologies PLC&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;IONA Technologies PLC - initial API and implementation"
-    modelDirectory="/org.eclipse.jst.ws.cxf.core/src" modelPluginID="org.eclipse.jst.ws.cxf.core"
-    modelName="CXF" rootExtendsInterface="" rootImplementsInterface="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" language="">
-  <foreignModel>CXF.ecore</foreignModel>
-  <genPackages prefix="CXF" basePackage="org.eclipse.jst.ws.internal.cxf.core" disposableProviderFactory="true"
-      ecorePackage="CXF.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="CXF.ecore#//Frontend">
-      <genEnumLiterals ecoreEnumLiteral="CXF.ecore#//Frontend/JAXWS"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="CXF.ecore#//DataBinding">
-      <genEnumLiterals ecoreEnumLiteral="CXF.ecore#//DataBinding/JAXB"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="CXF.ecore#//URL"/>
-    <genDataTypes ecoreDataType="CXF.ecore#//Definition"/>
-    <genDataTypes ecoreDataType="CXF.ecore#//Map">
-      <genTypeParameters ecoreTypeParameter="CXF.ecore#//Map/T"/>
-      <genTypeParameters ecoreTypeParameter="CXF.ecore#//Map/T1"/>
-    </genDataTypes>
-    <genDataTypes ecoreDataType="CXF.ecore#//IMethod"/>
-    <genClasses image="false" ecoreClass="CXF.ecore#//CXFContext">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeLocation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeEdition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfRuntimeVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/verbose"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateAntBuildFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateClient"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/generateServer"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/databinding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/frontend"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/useSpringApplicationContext"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/exportCXFClasspathContainer"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="CXF.ecore#//CXFDataModel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/projectName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/resourceDirectory"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/classDirectory"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlFileName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlURL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/configWsdlLocation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/fullyQualifiedJavaClassName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/fullyQualifiedJavaInterfaceName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/configId"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/targetNamespace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/endpointName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/serviceName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlDefinition"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFDataModel/wsdlLocation"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="CXF.ecore#//Java2WSContext">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/soap12Binding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateXSDImports"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWSDL"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWrapperFaultBeans"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/annotationProcessingEnabled"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWebMethodAnnotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateWebParamAnnotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateRequestWrapperAnnotation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSContext/generateResponseWrapperAnnotation"/>
-    </genClasses>
-    <genClasses ecoreClass="CXF.ecore#//Java2WSDataModel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/classpath"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/javaStartingPoint"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/useServiceEndpointInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/extractInterface"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/serviceEndpointInterfaceName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/methodMap"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/annotationMap"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/sourceDirectory"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//Java2WSDataModel/portName"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="CXF.ecore#//WSDL2JavaContext">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/generateImplementation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/processSOAPHeaders"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/loadDefaultNamespacePackageNameMapping"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/loadDefaultExcludesNamepsaceMapping"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/validate"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/wsdlVersion"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/useDefaultValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcArgs"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/noAddressBinding"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcUseDefaultValues"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToString"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToStringMultiLine"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcToStringSimple"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcLocator"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcSyncMethods"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcMarkGenerated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/xjcEpisodeFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaContext/autoNameResolution"/>
-    </genClasses>
-    <genClasses ecoreClass="CXF.ecore#//WSDL2JavaDataModel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/includedNamespaces"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/bindingFiles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/excludedNamespaces"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/catalogFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/javaSourceFolder"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
deleted file mode 100644
index 4e243e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-CXF_FACET_CORE_LABEL=CXF 2.x Web Services
-CXF_FACET_CORE_DISCRIPTION=Enables Web Services generation through CXF 2.x
-CXF_CORE_TEMPLATE_LABEL=CXF Web Services Project
-CXF_FACET_JST_WEB24_PRESET_LABEL=CXF Web Services Project v2.4
-CXF_FACET_JST_WEB25_PRESET_LABEL=CXF Web Services Project v2.5
-CXF_FACET_JST_WEB24_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.4 and Java v5.0
-CXF_FACET_JST_WEB25_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.5 and Java v5.0
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
deleted file mode 100644
index e783d88..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-    <extension point="org.eclipse.emf.ecore.generated_package">
-       <package 
-          uri = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore" 
-          class = "org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage"
-          genModel = "model/CXF.genmodel" /> 
-    </extension>
-    
-	<extension point="org.eclipse.wst.common.project.facet.core.facets">
-       <project-facet id="cxf.core">
-          <label>%CXF_FACET_CORE_LABEL</label>
-	      <description>%CXF_FACET_CORE_DISCRIPTION</description>
-	   </project-facet>
-       
-	   <project-facet-version facet="cxf.core" version="1.0">
-	      <constraint>
-		     <and>
-      	        <requires facet="jst.web" version="[2.4"/>
-      	        <requires facet="jst.java" version="[5.0"/>
-                <conflicts facet="axis2.core" version="[1.0"/>
-                <conflicts facet="axis2.ext" version="[1.0"/>
-             </and>
-          </constraint>
-          
-          <action id="cxf.core.install" type="INSTALL">
-      	     <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetInstallDelegate"/>
-    	  </action>
-          
-          <action id="cxf.core.uninstall" type="UNINSTALL">
-             <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetUninstallDelegate"/>
-          </action>
-  	   </project-facet-version>
-       <template id="template.cxf.core">
-          <label>%CXF_CORE_TEMPLATE_LABEL</label>
-          <fixed
-               facet="cxf.core">
-          </fixed>
-          <fixed
-               facet="jst.web">
-          </fixed>
-          <fixed
-               facet="jst.java">
-          </fixed>
-          <preset
-             id="cxf.jst.web24.preset">
-          </preset>
-       </template>
-	</extension>
-	
-	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
-       <supported>
-          <runtime-component any="true"/>
-          <facet
-             id="cxf.core"
-             version="1.0"/>
-       </supported>
-    </extension>
-
-    <extension point="org.eclipse.wst.common.project.facet.core.presets">
-       <static-preset id="cxf.jst.web24.preset">
-          <label>%CXF_FACET_JST_WEB24_PRESET_LABEL</label>
-          <description>%CXF_FACET_JST_WEB24_PRESET_DESCRIPTION</description>
-          <facet
-             id="cxf.core"
-             version="1.0">
-          </facet>
-          <facet
-             id="jst.web"
-             version="2.4">
-          </facet>
-          <facet
-             id="jst.java"
-             version="5.0">
-          </facet>
-       </static-preset>
-       <static-preset id="cxf.jst.web25.preset">
-          <label>%CXF_FACET_JST_WEB25_PRESET_LABEL</label>
-          <description>%CXF_FACET_JST_WEB25_PRESET_DESCRIPTION</description>
-          <facet
-             id="cxf.core"
-             version="1.0">
-          </facet>
-          <facet
-             id="jst.web"
-             version="2.5">
-          </facet>
-          <facet
-             id="jst.java"
-             version="5.0">
-          </facet>
-       </static-preset>
-    </extension>
-    
-    <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-       <classpathContainerInitializer
-             class="org.eclipse.jst.ws.internal.cxf.core.CXFClasspathContainerInitializer"
-             id="org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER">
-       </classpathContainerInitializer>
-    </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
deleted file mode 100644
index ebddbba..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-public class CXFClasspathContainer implements IClasspathContainer {
-
-	private IPath path;
-	private List<IClasspathEntry> classpathEntries;
-	private String cxfLibraryEdition;
-	private String cxfLibraryVersion;
-	private String cxfLibraryLocation;
-	
-	public CXFClasspathContainer(IPath path, IJavaProject javaProject) {
-		this.path = path;
-		classpathEntries =  new ArrayList<IClasspathEntry>();
-		cxfLibraryLocation = getCxfRuntimeLocation();
-		cxfLibraryVersion = getCxfRuntimeVersion();
-		cxfLibraryEdition = getCxfRuntimeEdition();
-	}
-	
-	public IClasspathEntry[] getClasspathEntries() {
-        if (!cxfLibraryVersion.equals(getCxfRuntimeVersion())) {
-            classpathEntries = new ArrayList<IClasspathEntry>();
-            cxfLibraryLocation = getCxfRuntimeLocation();
-            cxfLibraryVersion = getCxfRuntimeVersion();
-            cxfLibraryEdition = getCxfRuntimeEdition();
-        }
-
-	    if (classpathEntries.size() == 0) {
-	        File cxfLibDirectory = getCXFLibraryDirectory();
-	        if (cxfLibDirectory.exists() && cxfLibDirectory.isDirectory()) {
-	            String[] files = cxfLibDirectory.list();
-	            for (int i = 0; i < files.length; i++) {
-	                File file = new File(cxfLibDirectory.getPath() + File.separator + files[i]);
-	                String fileName = file.getName();
-	                if (fileName.indexOf(".") != -1
-	                        && fileName.substring(fileName.lastIndexOf("."), fileName.length()).equals(
-	                                ".jar")) {
-	                	classpathEntries.add(JavaCore.newLibraryEntry(new Path(file.getAbsolutePath()), null, 
-	                	        new Path("/")));
-	                }
-	            }
-	        }
-		}
-		return classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]);
-	}
-	
-	public boolean isValid() {
-	    if (getCxfRuntimeLocation().length() > 0) {
-            File cxfLibDirectory = getCXFLibraryDirectory();
-            return cxfLibDirectory.exists() && cxfLibDirectory.isDirectory();
-	    }
-	    return false;
-	}
-	
-	public String getDescription() {
-		return  MessageFormat.format(CXFCoreMessages.CXF_CONTAINER_LIBRARY, cxfLibraryEdition, 
-		        cxfLibraryVersion);
-	}
-
-	public int getKind() {
-		return K_APPLICATION;
-	}
-
-	public IPath getPath() {
-		return path;
-	}
-	
-	private String getCxfRuntimeLocation() {
-	    return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation();
-    }
-
-    private String getCxfRuntimeVersion() {
-        return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
-    }
-
-    private String getCxfRuntimeEdition() {
-        return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeEdition();
-    }
-
-	private File getCXFLibraryDirectory() {
-        IPath cxfLibPath = new Path(cxfLibraryLocation);
-        if (!cxfLibPath.hasTrailingSeparator()) {
-            cxfLibPath = cxfLibPath.addTrailingSeparator();
-        }
-        cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
-        File cxfLibDirectory = new File(cxfLibPath.toOSString());
-        return cxfLibDirectory;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
deleted file mode 100644
index 6742391..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-public class CXFClasspathContainerInitializer extends ClasspathContainerInitializer {
-
-	@Override
-	public void initialize(IPath containerPath, IJavaProject javaProject) throws CoreException {
-	    CXFClasspathContainer cxfClasspathContainer = new CXFClasspathContainer(containerPath, javaProject);
-	    
-	    if (cxfClasspathContainer.isValid()) {
-	        JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {javaProject}, 
-				new IClasspathContainer[] {cxfClasspathContainer}, null);
-	    }
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
deleted file mode 100644
index 076592c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.core.CXFCoreMessages"; //$NON-NLS-1$
-
-    public static String CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET;
-
-    public static String CXF_CONTAINER_LIBRARY;
-    
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, CXFCoreMessages.class);
-    }
-
-    private CXFCoreMessages() {
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.properties
deleted file mode 100644
index 45daa76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-#JDTUtils
-CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET=CXF Runtime location not set. Please set location in Preferences > Web Services > CXf 2.x Preferences
-CXF_CONTAINER_LIBRARY={0} Library [{1}]
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
deleted file mode 100644
index 4e65100..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- */
-public class CXFCorePlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.core"; //$NON-NLS-1$
-
-    public static final String CXF_VERSION_2_0 = "2.0"; //$NON-NLS-1$
-
-    public static final String CXF_VERSION_2_1 = "2.1"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFCorePlugin plugin;
-
-    private Java2WSPersistentContext java2WSContext;
-    private WSDL2JavaPersistentContext wsdl2JavaContext;
-
-    private Version currentRuntimeVersion;
-    
-    /**
-     * The constructor
-     */
-    public CXFCorePlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFCorePlugin getDefault() {
-        return plugin;
-    }
-
-    public Java2WSPersistentContext getJava2WSContext() {
-        if (java2WSContext == null) {
-            java2WSContext = new Java2WSPersistentContext();
-            java2WSContext.load();
-        }
-        return java2WSContext;
-    }
-
-    public WSDL2JavaPersistentContext getWSDL2JavaContext() {
-        if (wsdl2JavaContext == null) {
-            wsdl2JavaContext = new WSDL2JavaPersistentContext();
-            wsdl2JavaContext.load();
-        }
-        return wsdl2JavaContext;
-    }
-
-    public Version getCurrentRuntimeVersion() {
-        if (currentRuntimeVersion == null) {
-            String cxfRuntimeVersion = CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
-            if (cxfRuntimeVersion.length() == 0) {
-                cxfRuntimeVersion = "0.0.0";
-            }
-            this.currentRuntimeVersion = new Version(cxfRuntimeVersion);
-        }
-        return currentRuntimeVersion;
-    }
-
-    public void setCurrentRuntimeVersion(Version version) {
-        this.currentRuntimeVersion = version;
-    }
-    
-    public static void logMessage(int severity, String message) {
-        CXFCorePlugin.log(new Status(severity, CXFCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFCorePlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFCorePlugin.log(new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 
-                exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
deleted file mode 100644
index b94407b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-@SuppressWarnings("restriction")
-public abstract class CXFPersistentContext extends PersistentContext implements CXFContext {
-    /**
-     * String constant used to lookup the cxf runtime location general
-     * preference from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_LOCATION = "cxfRuntimeLocation"; //$NON-NLS-1$
-
-    /**
-     * Stirng constant used to lookup the cxf runtime edition general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_EDITION = "cxfRuntimeEdition"; //$NON-NLS-1$
-
-    /**
-     * Stirng constant used to lookup the cxf version general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_VERSION = "cxfRuntimeVersion"; //$NON-NLS-1$
-    
-    private static final String PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER = "exportCXFClasspathContainer"; //$NON-NLS-1$
-
-    private static final String PREFERENCE_CXF_VERBOSE = "cxfVerbose"; //$NON-NLS-1$
-
-    private static final String PREFERENCE_CXF_USE_SPRING_APP_CONTEXT = "cxfUseSpringAppContext"; //$NON-NLS-1$
-
-    public CXFPersistentContext(Plugin plugin) {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        setDefault(PREFERENCE_CXF_RUNTIME_LOCATION, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_EDITION, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_VERSION, ""); //$NON-NLS-1$
-        
-        setDefault(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-
-        setDefault(PREFERENCE_CXF_VERBOSE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__VERBOSE));
-
-        setDefault(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT));
-    }
-
-    public String getCxfRuntimeLocation() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_LOCATION);
-    }
-
-    public void setCxfRuntimeLocation(String runtimeLocation) {
-        setValue(PREFERENCE_CXF_RUNTIME_LOCATION, runtimeLocation);
-    }
-    
-    public String getCxfRuntimeEdition() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_EDITION);
-    }
-
-    public void setCxfRuntimeEdition(String runtimeEdition) {
-        setValue(PREFERENCE_CXF_RUNTIME_EDITION, runtimeEdition);
-    }
-
-    public String getCxfRuntimeVersion() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_VERSION);
-    }
-
-    public void setCxfRuntimeVersion(String runtimeVersion) {
-        setValue(PREFERENCE_CXF_RUNTIME_VERSION, runtimeVersion);
-    }
-    
-    public boolean isExportCXFClasspathContainer() {
-        return getValueAsBoolean(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER);
-    }
-
-    public void setExportCXFClasspathContainer(boolean exportCXFClasspathContainer) {
-        setValue(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, exportCXFClasspathContainer);
-    }
-
-    public boolean isVerbose() {
-        return getValueAsBoolean(PREFERENCE_CXF_VERBOSE);
-    }
-
-    public void setVerbose(boolean verbose) {
-        setValue(PREFERENCE_CXF_VERBOSE, true);
-    }
-
-    public boolean isUseSpringApplicationContext() {
-        return getValueAsBoolean(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT);
-    }
-
-    public void setUseSpringApplicationContext(boolean useSpringAppContext) {
-        setValue(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, useSpringAppContext);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
deleted file mode 100644
index c61e17d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.context;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-
-@SuppressWarnings("restriction")
-public class Java2WSPersistentContext extends CXFPersistentContext implements Java2WSContext {
-    /**
-     * String constant used to lookup the cxf soap binding general preference
-     * from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_J2WS_SOAP12_BINDING = "cxfJ2WSSoap12Binding"; //$NON-NLS-1$
-    /**
-     * String constant used to lookup the cxf generate xsd imports general
-     * preference from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_J2WS_GENERATE_XSD_IMPORTS = "cxfJ2WSXSDImports"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf default frontend general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_DEFAULT_FRONTEND = "cxfJ2WSDefaultFrontend"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf default Databinding general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_DEFAULT_DATABINDING = "cxfJ2WSDefaultDatabinding"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate client general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_CLIENT = "cxfJ2WSGenerateClient"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate server general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_SERVER = "cxfJ2WSGenerateServer"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate wrapper and fault beans
-     * general preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS = "cxfJ2WSGenerateWrapperFault"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate wsdl general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_WSDL = "cxfJ2WSGenerateWSDL"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate ant build file general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE = "cxfJ2WSGenerateANTBuildFile"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the APT annotation processing general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING 
-        = "cxfJ2WSEnableAnnotationProcessing"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@WebMethod</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION 
-        = "cxfJ2WSGenerateWebMethodAnnotation"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@WebParam</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION 
-        = "cxfJ2WSGenerateWebParamAnnotation"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@RequestWrapper</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION 
-        = "cxfJ2WSGenerateRequestWrapperAnnotation"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the generate <code>@ResponseWrapper</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION 
-        = "cxfJ2WSGenerateResponseWrapperAnnotation"; //$NON-NLS-1$
-
-    public Java2WSPersistentContext() {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        super.load();
-        setDefault(PREFERENCE_J2WS_SOAP12_BINDING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
-        setDefault(PREFERENCE_J2WS_DEFAULT_DATABINDING, DataBinding.JAXB.getLiteral());
-
-        setDefault(PREFERENCE_J2WS_DEFAULT_FRONTEND, Frontend.JAXWS.getLiteral());
-
-        setDefault(PREFERENCE_J2WS_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
-
-        setDefault(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
-
-        //TODO MOVE THE FOLLOWING 4
-        setDefault(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                        CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
-    }
-
-    public boolean isSoap12Binding() {
-        return getValueAsBoolean(PREFERENCE_J2WS_SOAP12_BINDING);
-    }
-
-    public void setSoap12Binding(boolean soap12Binding) {
-        setValue(PREFERENCE_J2WS_SOAP12_BINDING, soap12Binding);
-    }
-
-    public boolean isGenerateXSDImports() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS);
-    }
-
-    public void setGenerateXSDImports(boolean generateXSDImports) {
-        setValue(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, generateXSDImports);
-    }
-
-    public DataBinding getDatabinding() {
-        return DataBinding.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_DATABINDING));
-    }
-
-    public void setDatabinding(DataBinding dataBinding) {
-        setValue(PREFERENCE_J2WS_DEFAULT_DATABINDING, dataBinding.getLiteral());
-    }
-
-    public Frontend getFrontend() {
-        return Frontend.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_FRONTEND));
-    }
-
-    public void setFrontend(Frontend defaultFrontend) {
-        setValue(PREFERENCE_J2WS_DEFAULT_FRONTEND, defaultFrontend.getLiteral());
-    }
-
-    public boolean isGenerateClient() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_CLIENT);
-    }
-
-    public void setGenerateClient(boolean generateClient) {
-        setValue(PREFERENCE_J2WS_GENERATE_CLIENT, generateClient);
-    }
-
-    public boolean isGenerateServer() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_SERVER);
-    }
-
-    public void setGenerateServer(boolean generateServer) {
-        setValue(PREFERENCE_J2WS_GENERATE_SERVER, generateServer);
-    }
-
-    public boolean isGenerateWrapperFaultBeans() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS);
-    }
-
-    public void setGenerateWrapperFaultBeans(boolean generateWrapperFaultBeans) {
-        setValue(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, generateWrapperFaultBeans);
-    }
-
-    public boolean isGenerateWSDL() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WSDL);
-    }
-
-    public void setGenerateWSDL(boolean generateWSDL) {
-        setValue(PREFERENCE_J2WS_GENERATE_WSDL, generateWSDL);
-    }
-
-    public boolean isGenerateAntBuildFile() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE);
-    }
-
-    public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
-        setValue(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
-    }
-
-    public boolean isAnnotationProcessingEnabled() {
-        return getValueAsBoolean(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING);
-    }
-
-    public boolean isGenerateWebMethodAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION);
-    }
-
-    public boolean isGenerateWebParamAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION);
-    }
-
-    public void setGenerateWebParamAnnotation(boolean generateWebParamAnnotation) {
-        setValue(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, generateWebParamAnnotation);
-    }
-    
-    public void setGenerateWebMethodAnnotation(boolean generateWebMethodAnnotation) {
-        setValue(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, generateWebMethodAnnotation);
-    }
-    
-    public void setAnnotationProcessingEnabled(boolean enableAnnotationProcessing) {
-        setValue(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, enableAnnotationProcessing);
-    }
-    
-    public boolean isGenerateRequestWrapperAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION);
-    }
-
-    public void setGenerateRequestWrapperAnnotation(boolean generateRequestWrapperAnnotation) {
-        setValue(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, generateRequestWrapperAnnotation);
-    }
-
-    public boolean isGenerateResponseWrapperAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION);
-    }
-
-    public void setGenerateResponseWrapperAnnotation(boolean generateResponseWrapperAnnotation) {
-        setValue(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, generateResponseWrapperAnnotation);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
deleted file mode 100644
index 182d3f1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.context;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaPersistentContext extends CXFPersistentContext implements WSDL2JavaContext {
-    public static final String PREFERENCE_W2J_GENERATE_CLIENT = "cxfW2JGenerateClient"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_SERVER = "cxfW2JGenerateServer"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_IMPLEMENTATION = "cxfW2JGenerateImplementation"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE = "cxfW2JGenerateAntBuildFile"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_PROCESS_SOAP_HEADERS = "cxfW2JProcessSOAPHeaders"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING 
-        = "cxfW2JLoadDefaultNamespacePackagenameMapping"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING 
-        = "cxfW2JLoadDefaultExcludesNamepsaceMapping"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_VALIDATE_WSDL = "cxfW2JValidateWSDL"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_DATABINDING = "cxfW2JDatabinding"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_FRONTEND = "cxfW2JFrontend"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_WSDL_VERSION = "cxfW2JWSDLVersion"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_XJC_ARGS = "cxfW2JXJCArgs"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_NO_ADDRESS_BINDING = "cxfW2JNoAddressBinding"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_USE_DEFAULT_VALUES = "cxfW2JUseDefaultValues"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_AUTO_NAME_RESOLUTION = "cxfW2JAutoNameResolution"; //$NON-NLS-1$
-
-    public static final String XJC_USE_DEFAULT_VALUES = "xjcUseDefaultValues"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING = "xjcToString"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING_MULTI = "xjcToStringMulti"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING_SIMPLE = "xjcToStringSimple"; //$NON-NLS-1$
-    public static final String XJC_LOCATOR = "xjcLocator"; //$NON-NLS-1$
-    public static final String XJC_SYNC_METHODS = "xjcSyncMethods"; //$NON-NLS-1$
-    public static final String XJC_MARK_GENERATED = "xjcMarkGenerated"; //$NON-NLS-1$
-    public static final String XJC_EPISODE_FILE = "xjcEpisodeFile"; //$NON-NLS-1$
-
-    public WSDL2JavaPersistentContext() {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        super.load();
-        setDefault(PREFERENCE_W2J_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
-        setDefault(PREFERENCE_W2J_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
-        setDefault(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
-        setDefault(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE));
-
-        setDefault(PREFERENCE_W2J_XJC_ARGS, ""); //$NON-NLS-1$
-
-        setDefault(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                        CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                        CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
-        setDefault(PREFERENCE_W2J_VALIDATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE));
-
-        setDefault(PREFERENCE_W2J_DATABINDING, DataBinding.JAXB.getLiteral());
-
-        setDefault(PREFERENCE_W2J_FRONTEND, Frontend.JAXWS.getLiteral());
-
-        setDefault(PREFERENCE_W2J_WSDL_VERSION, CXFPackage.eINSTANCE.getWSDL2JavaContext_WsdlVersion()
-                .getDefaultValueLiteral());
-
-        setDefault(PREFERENCE_W2J_NO_ADDRESS_BINDING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
-        setDefault(PREFERENCE_W2J_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
-        setDefault(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
-
-        setDefault(XJC_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
-        setDefault(XJC_TO_STRING, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
-        setDefault(XJC_TO_STRING_MULTI, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
-        setDefault(XJC_TO_STRING_SIMPLE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
-        setDefault(XJC_LOCATOR, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
-        setDefault(XJC_SYNC_METHODS, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
-        setDefault(XJC_MARK_GENERATED, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
-
-        setDefault(XJC_EPISODE_FILE, ""); //$NON-NLS-1$
-    }
-
-    public boolean isGenerateAntBuildFile() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE);
-    }
-
-    public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
-        setValue(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
-    }
-
-    public boolean isGenerateClient() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_CLIENT);
-    }
-
-    public void setGenerateClient(boolean generateClient) {
-        setValue(PREFERENCE_W2J_GENERATE_CLIENT, generateClient);
-    }
-
-    public boolean isGenerateImplementation() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_IMPLEMENTATION);
-    }
-
-    public void setGenerateImplementation(boolean generateImplementation) {
-        setValue(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, generateImplementation);
-    }
-
-    public boolean isGenerateServer() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_SERVER);
-    }
-
-    public void setGenerateServer(boolean generateServer) {
-        setValue(PREFERENCE_W2J_GENERATE_SERVER, generateServer);
-    }
-
-    public boolean isLoadDefaultNamespacePackageNameMapping() {
-        return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING);
-    }
-
-    public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
-        setValue(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING,
-                loadDefaultNamespacePackageNameMapping);
-    }
-
-    public boolean isLoadDefaultExcludesNamepsaceMapping() {
-        return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
-    }
-
-    public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
-        setValue(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, loadDefaultExcludesNamepsaceMapping);
-    }
-
-    public boolean isProcessSOAPHeaders() {
-        return getValueAsBoolean(PREFERENCE_W2J_PROCESS_SOAP_HEADERS);
-    }
-
-    public void setProcessSOAPHeaders(boolean processSoapHeaders) {
-        setValue(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, processSoapHeaders);
-    }
-
-    public boolean isValidate() {
-        return getValueAsBoolean(PREFERENCE_W2J_VALIDATE_WSDL);
-    }
-
-    public void setValidate(boolean validate) {
-        setValue(PREFERENCE_W2J_VALIDATE_WSDL, validate);
-    }
-
-    public DataBinding getDatabinding() {
-        return DataBinding.get(getValueAsString(PREFERENCE_W2J_DATABINDING));
-    }
-
-    public void setDatabinding(DataBinding dataBinding) {
-        setValue(PREFERENCE_W2J_DATABINDING, dataBinding.getLiteral());
-    }
-
-    public Frontend getFrontend() {
-        return Frontend.get(getValueAsString(PREFERENCE_W2J_FRONTEND));
-    }
-
-    public void setFrontend(Frontend frontend) {
-        setValue(PREFERENCE_W2J_FRONTEND, frontend.getLiteral());
-    }
-
-    public String getWsdlVersion() {
-        return getValueAsString(PREFERENCE_W2J_WSDL_VERSION);
-    }
-
-    public void setWsdlVersion(String wsdlVersion) {
-        setValue(PREFERENCE_W2J_WSDL_VERSION, wsdlVersion);
-    }
-
-    public String getXjcArgs() {
-        return getValueAsString(PREFERENCE_W2J_XJC_ARGS);
-    }
-
-    public void setXjcArgs(String xjcArgs) {
-        setValue(PREFERENCE_W2J_XJC_ARGS, xjcArgs);
-    }
-
-    public boolean isNoAddressBinding() {
-        return getValueAsBoolean(PREFERENCE_W2J_NO_ADDRESS_BINDING);
-    }
-
-    public void setNoAddressBinding(boolean noAddressBinding) {
-        setValue(PREFERENCE_W2J_NO_ADDRESS_BINDING, noAddressBinding);
-    }
-    
-    public boolean isAutoNameResolution() {
-        return getValueAsBoolean(PREFERENCE_W2J_AUTO_NAME_RESOLUTION);
-    }
-
-    public void setAutoNameResolution(boolean autoNameResolution) {
-        setValue(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, autoNameResolution);
-    }
-
-    public boolean isUseDefaultValues() {
-        return getValueAsBoolean(PREFERENCE_W2J_USE_DEFAULT_VALUES);
-    }
-
-    public void setUseDefaultValues(boolean useDefaultValues) {
-        setValue(PREFERENCE_W2J_USE_DEFAULT_VALUES, useDefaultValues);
-    }
-
-    
-    public boolean isXjcUseDefaultValues() {
-        return getValueAsBoolean(XJC_USE_DEFAULT_VALUES);
-    }
-
-    public void setXjcUseDefaultValues(boolean useXJCDefaultValues) {
-        setValue(XJC_USE_DEFAULT_VALUES, useXJCDefaultValues);
-    }
-
-    public boolean isXjcToString() {
-        return getValueAsBoolean(XJC_TO_STRING);
-    }
-
-    public void setXjcToString(boolean xjcToString) {
-        setValue(XJC_TO_STRING, xjcToString);
-    }
-
-    public boolean isXjcToStringMultiLine() {
-        return getValueAsBoolean(XJC_TO_STRING_MULTI);
-    }
-
-    public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
-        setValue(XJC_TO_STRING_MULTI, xjcToStringMultiLine);
-    }
-
-    public boolean isXjcToStringSimple() {
-        return getValueAsBoolean(XJC_TO_STRING_SIMPLE);
-    }
-
-    public void setXjcToStringSimple(boolean xjcToStringSimple) {
-        setValue(XJC_TO_STRING_SIMPLE, xjcToStringSimple);
-    }
-
-    public boolean isXjcLocator() {
-        return getValueAsBoolean(XJC_LOCATOR);
-    }
-
-    public void setXjcLocator(boolean xjcLocator) {
-        setValue(XJC_LOCATOR, xjcLocator);
-    }
-
-    public boolean isXjcSyncMethods() {
-        return getValueAsBoolean(XJC_SYNC_METHODS);
-    }
-
-    public void setXjcSyncMethods(boolean xjcSyncMethods) {
-        setValue(XJC_SYNC_METHODS, xjcSyncMethods);
-    }
-
-    public boolean isXjcMarkGenerated() {
-        return getValueAsBoolean(XJC_MARK_GENERATED);
-    }
-
-    public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
-        setValue(XJC_MARK_GENERATED, xjcMarkGenerated);
-    }
-
-    public String getXjcEpisodeFile() {
-        return getValueAsString(XJC_EPISODE_FILE);
-    }
-
-    public void setXjcEpisodeFile(String xjcEpisodeFile) {
-        setValue(XJC_EPISODE_FILE, xjcEpisodeFile);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
deleted file mode 100644
index 694be28..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-/**
- * 
- * @model abstract="true" interface="true"
- */
-public interface CXFContext {
-
-    /**
-     * Returns the CXF Home Directory location.
-     * 
-     * @model
-     */
-    String getCxfRuntimeLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Home Directory location.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Location</em>' attribute.
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     */
-    void setCxfRuntimeLocation(String value);
-
-    /**
-     * Returns the CXF Runtime Edition.
-     * 
-     * @model
-     */
-    String getCxfRuntimeEdition();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Runtime Edition.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Edition</em>' attribute.
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     */
-    void setCxfRuntimeEdition(String value);
-
-    /**
-     * Returns the CXF Tool version.
-     * 
-     * @model
-     */
-    String getCxfRuntimeVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Tool version
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Version</em>' attribute.
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     */
-    void setCxfRuntimeVersion(String value);
-
-    /**
-     * Returns whether comments are shown during the code generation process.
-     * 
-     * @model default="true"
-     */
-    boolean isVerbose();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Displays comments during the code generation process.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Verbose</em>' attribute.
-     * @see #isVerbose()
-     * @generated
-     */
-    void setVerbose(boolean value);
-
-    /**
-     * Returns whether to generate an Ant build.xml file.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateAntBuildFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Set to generate an Ant build.xml file.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Ant Build File</em>' attribute.
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     */
-    void setGenerateAntBuildFile(boolean value);
-
-    /**
-     * Returns whether to generate a client.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateClient();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate client side code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Client</em>' attribute.
-     * @see #isGenerateClient()
-     * @generated
-     */
-    void setGenerateClient(boolean value);
-
-    /**
-     * Returns whether to generate a server.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateServer();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate server side code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Server</em>' attribute.
-     * @see #isGenerateServer()
-     * @generated
-     */
-    void setGenerateServer(boolean value);
-
-    /**
-     * Returns the data binding used.
-     * 
-     * @model default="jaxb"
-     */
-    DataBinding getDatabinding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Databinding</em>' attribute.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @see #getDatabinding()
-     * @generated
-     */
-    void setDatabinding(DataBinding value);
-
-    /**
-     * Returns the frontend used.
-     * 
-     * @model default="jaxws"
-     */
-    Frontend getFrontend();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Frontend</em>' attribute.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @see #getFrontend()
-     * @generated
-     */
-    void setFrontend(Frontend value);
-
-    /**
-     * Returns if the Spring Application Context is used instead of cxf-servlet.
-     * 
-     * @model default="true"
-     */
-    boolean isUseSpringApplicationContext();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * If true the Spring Application Context is used otherwise cxf servlet.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Spring Application Context</em>' attribute.
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     */
-    void setUseSpringApplicationContext(boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * The default value is <code>"true"</code>.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Export CXF Classpath Container</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Export CXF Classpath Container</em>' attribute.
-     * @see #setExportCXFClasspathContainer(boolean)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_ExportCXFClasspathContainer()
-     * @model default="true"
-     * @generated
-     */
-    boolean isExportCXFClasspathContainer();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Export CXF Classpath Container</em>' attribute.
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     */
-    void setExportCXFClasspathContainer(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java
deleted file mode 100644
index 03a1cee..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.net.URL;
-import javax.wsdl.Definition;
-
-/**
- * 
- * @model abstract="true"
- */
-public interface CXFDataModel extends CXFContext {
-    /**
-     * Returns the originating project that contains the java or wsdl resource.
-     * 
-     * @model
-     */
-    String getProjectName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the originating project that contains the java or wsdl resource.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Project Name</em>' attribute.
-     * @see #getProjectName()
-     * @generated
-     */
-    void setProjectName(String value);
-
-    /**
-     * Returns the resource directory in which the output files are placed.
-     *  
-     * @model
-     */
-    String getResourceDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the resource directory in which the output files are placed.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Resource Directory</em>' attribute.
-     * @see #getResourceDirectory()
-     * @generated
-     */
-    void setResourceDirectory(String value);
-
-    /**
-     * Returns the directory in which the generated sources are compiled into.
-     * If not specified, the files are not compiled.
-     * 
-     * @model
-     */
-    String getClassDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets directory in which the generated sources are compiled into. If not
-     * specified, the files are not compiled.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Class Directory</em>' attribute.
-     * @see #getClassDirectory()
-     * @generated
-     */
-    void setClassDirectory(String value);
-
-    /**
-     * Returns the name of the WSDL File that is used as input to WSDL2Java or
-     * is the output of Java2WS.
-     * 
-     * @model
-     */
-    String getWsdlFileName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl File Name</em>' attribute.
-     * @see #getWsdlFileName()
-     * @generated
-     */
-    void setWsdlFileName(String value);
-
-    /**
-     * Returns the WSDL URL.
-     * 
-     * @model
-     */
-    URL getWsdlURL();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl URL</em>' attribute.
-     * @see #getWsdlURL()
-     * @generated
-     */
-    void setWsdlURL(URL value);
-
-    /**
-     * Returns the wsdl location relative to the WebContent directory.
-     * Used in the spring configuration.
-     * 
-     * @model
-     */
-    String getConfigWsdlLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Config Wsdl Location</em>' attribute.
-     * @see #getConfigWsdlLocation()
-     * @generated
-     */
-    void setConfigWsdlLocation(String value);
-
-    /**
-     * Returns the Java Class that may be used as input to Java2WS or is the output
-     * of WSDL2Java.
-     * 
-     * @model
-     */
-    String getFullyQualifiedJavaClassName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the Java Class that may be used as input to Java2WS or is the output of WSDL2Java.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Fully Qualified Java Class Name</em>' attribute.
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     */
-    void setFullyQualifiedJavaClassName(String value);
-
-    /**
-     * Returns the name of the Java Interface that may be used as input to Java2WS.
-     * 
-     * @model
-     */
-    String getFullyQualifiedJavaInterfaceName();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the name of the Java Interface that may be used as input to Java2WS.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Fully Qualified Java Interface Name</em>' attribute.
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     */
-    void setFullyQualifiedJavaInterfaceName(String value);
-
-    /**
-     * Used in the CXF Spring Configuration to uniquely identify elements.
-     * 
-     * @model
-     */
-    String getConfigId();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Config Id</em>' attribute.
-     * @see #getConfigId()
-     * @generated
-     */
-    void setConfigId(String value);
-
-    /**
-     * Returns the targetNamespace.
-     * 
-     * @model
-     */
-    String getTargetNamespace();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the targetNamespace.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Target Namespace</em>' attribute.
-     * @see #getTargetNamespace()
-     * @generated
-     */
-    void setTargetNamespace(String value);
-
-    /**
-     * Returns the endointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * 
-     * @model
-     */
-    String getEndpointName();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the endpointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Endpoint Name</em>' attribute.
-     * @see #getEndpointName()
-     * @generated
-     */
-    void setEndpointName(String value);
-
-    /**
-     * Returns the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * 
-     * @model
-     */
-    String getServiceName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Service Name</em>' attribute.
-     * @see #getServiceName()
-     * @generated
-     */
-    void setServiceName(String value);
-
-    /**
-     * @model
-     */
-    Definition getWsdlDefinition();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Definition</em>' attribute.
-     * @see #getWsdlDefinition()
-     * @generated
-     */
-    void setWsdlDefinition(Definition value);
-
-    /**
-     * @model
-     */
-    String getWsdlLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Location</em>' attribute.
-     * @see #getWsdlLocation()
-     * @generated
-     */
-    void setWsdlLocation(String value);
-        
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
deleted file mode 100644
index 57e301b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFFactory.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public interface CXFFactory extends EFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    CXFFactory eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFFactoryImpl.init();
-
-    /**
-     * Returns a new object of class '<em>Java2 WS Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Java2 WS Data Model</em>'.
-     * @generated
-     */
-    Java2WSDataModel createJava2WSDataModel();
-
-    /**
-     * Returns a new object of class '<em>WSDL2 Java Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>WSDL2 Java Data Model</em>'.
-     * @generated
-     */
-    WSDL2JavaDataModel createWSDL2JavaDataModel();
-
-    /**
-     * Returns the package supported by this factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the package supported by this factory.
-     * @generated
-     */
-    CXFPackage getCXFPackage();
-
-} //CXFFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
deleted file mode 100644
index 2e1d5b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
+++ /dev/null
@@ -1,3350 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFPackage.java,v 1.3 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory
- * @model kind="package"
- * @generated
- */
-public interface CXFPackage extends EPackage {
-    /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNAME = "model";
-
-    /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNS_URI = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore";
-
-    /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNS_PREFIX = "org.eclipse.jst.ws.internal.cxf.core.model";
-
-    /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    CXFPackage eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl.init();
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
-     * @generated
-     */
-    int CXF_CONTEXT = 0;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_LOCATION = 0;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_EDITION = 1;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_VERSION = 2;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__VERBOSE = 3;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_CLIENT = 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_SERVER = 6;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__DATABINDING = 7;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__FRONTEND = 8;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = 9;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = 10;
-
-    /**
-     * The number of structural features of the '<em>Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT_FEATURE_COUNT = 11;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
-     * @generated
-     */
-    int CXF_DATA_MODEL = 1;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__PROJECT_NAME = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__RESOURCE_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CLASS_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_FILE_NAME = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_URL = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CONFIG_ID = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__TARGET_NAMESPACE = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__ENDPOINT_NAME = CXF_CONTEXT_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__SERVICE_NAME = CXF_CONTEXT_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_DEFINITION = CXF_CONTEXT_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 13;
-
-    /**
-     * The number of structural features of the '<em>Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 14;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
-     * @generated
-     */
-    int JAVA2_WS_CONTEXT = 2;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__SOAP12_BINDING = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WSDL = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The number of structural features of the '<em>Java2 WS Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
-     * @generated
-     */
-    int JAVA2_WS_DATA_MODEL = 3;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SOAP12_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WSDL = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Classpath</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CLASSPATH = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Java Starting Point</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Use Service Endpoint Interface</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Extract Interface</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Service Endpoint Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Method Map</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__METHOD_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Annotation Map</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Source Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Port Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__PORT_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
-    /**
-     * The number of structural features of the '<em>Java2 WS Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
-     * @generated
-     */
-    int WSDL2_JAVA_CONTEXT = 4;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Validate</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__VALIDATE = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__WSDL_VERSION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_ARGS = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING = CXF_CONTEXT_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = CXF_CONTEXT_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = CXF_CONTEXT_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_LOCATOR = CXF_CONTEXT_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = CXF_CONTEXT_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = CXF_CONTEXT_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = CXF_CONTEXT_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = CXF_CONTEXT_FEATURE_COUNT + 17;
-
-    /**
-     * The number of structural features of the '<em>WSDL2 Java Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 18;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
-     * @generated
-     */
-    int WSDL2_JAVA_DATA_MODEL = 5;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Validate</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__VALIDATE = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_VERSION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_ARGS = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
-    /**
-     * The feature id for the '<em><b>Included Namespaces</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
-    /**
-     * The feature id for the '<em><b>Binding Files</b></em>' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__BINDING_FILES = CXF_DATA_MODEL_FEATURE_COUNT + 19;
-
-    /**
-     * The feature id for the '<em><b>Excluded Namespaces</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 20;
-
-    /**
-     * The feature id for the '<em><b>Catalog File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 21;
-
-    /**
-     * The feature id for the '<em><b>Java Source Folder</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = CXF_DATA_MODEL_FEATURE_COUNT + 22;
-
-    /**
-     * The number of structural features of the '<em>WSDL2 Java Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 23;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
-     * @generated
-     */
-    int FRONTEND = 6;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
-     * @generated
-     */
-    int DATA_BINDING = 7;
-
-    /**
-     * The meta object id for the '<em>URL</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see java.net.URL
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
-     * @generated
-     */
-    int URL = 8;
-
-    /**
-     * The meta object id for the '<em>Definition</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.Definition
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
-     * @generated
-     */
-    int DEFINITION = 9;
-
-    /**
-     * The meta object id for the '<em>Map</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see java.util.Map
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
-     * @generated
-     */
-    int MAP = 10;
-
-    /**
-     * The meta object id for the '<em>IMethod</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jdt.core.IMethod
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
-     * @generated
-     */
-    int IMETHOD = 11;
-
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @generated
-     */
-    EClass getCXFContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeLocation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Edition</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeEdition();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeVersion();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Verbose</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Verbose();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Ant Build File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateAntBuildFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Client</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateClient();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Server</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateServer();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Databinding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Databinding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Frontend</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Frontend();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Spring Application Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_UseSpringApplicationContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Export CXF Classpath Container</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_ExportCXFClasspathContainer();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
-     * @generated
-     */
-    EClass getCXFDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Project Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ProjectName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Resource Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ResourceDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Class Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ClassDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl File Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlFileName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl URL</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlURL();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Config Wsdl Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ConfigWsdlLocation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Fully Qualified Java Class Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_FullyQualifiedJavaClassName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Fully Qualified Java Interface Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Config Id</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ConfigId();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Target Namespace</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_TargetNamespace();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Endpoint Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_EndpointName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Service Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ServiceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Definition</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlDefinition();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlLocation();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Java2 WS Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @generated
-     */
-    EClass getJava2WSContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Soap12 Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_Soap12Binding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate XSD Imports</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateXSDImports();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate WSDL</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWSDL();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Wrapper Fault Beans</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWrapperFaultBeans();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Annotation Processing Enabled</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_AnnotationProcessingEnabled();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Web Method Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWebMethodAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Web Param Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWebParamAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Request Wrapper Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Response Wrapper Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Java2 WS Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
-     * @generated
-     */
-    EClass getJava2WSDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Classpath</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_Classpath();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Java Starting Point</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_JavaStartingPoint();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Service Endpoint Interface</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_UseServiceEndpointInterface();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Extract Interface</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_ExtractInterface();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Service Endpoint Interface Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Method Map</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_MethodMap();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Annotation Map</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_AnnotationMap();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Source Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_SourceDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Port Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_PortName();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>WSDL2 Java Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @generated
-     */
-    EClass getWSDL2JavaContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Implementation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_GenerateImplementation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Process SOAP Headers</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_ProcessSOAPHeaders();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Load Default Namespace Package Name Mapping</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Load Default Excludes Namepsace Mapping</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Validate</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_Validate();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_WsdlVersion();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Default Values</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_UseDefaultValues();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Args</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcArgs();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>No Address Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_NoAddressBinding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Use Default Values</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcUseDefaultValues();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToString();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String Multi Line</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToStringMultiLine();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String Simple</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToStringSimple();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Locator</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcLocator();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Sync Methods</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcSyncMethods();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Mark Generated</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcMarkGenerated();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Episode File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcEpisodeFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Auto Name Resolution</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_AutoNameResolution();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>WSDL2 Java Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
-     * @generated
-     */
-    EClass getWSDL2JavaDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Included Namespaces</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_IncludedNamespaces();
-
-    /**
-     * Returns the meta object for the attribute list '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles <em>Binding Files</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute list '<em>Binding Files</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_BindingFiles();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Excluded Namespaces</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_ExcludedNamespaces();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Catalog File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_CatalogFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Java Source Folder</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_JavaSourceFolder();
-
-    /**
-     * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Frontend</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @generated
-     */
-    EEnum getFrontend();
-
-    /**
-     * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Data Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @generated
-     */
-    EEnum getDataBinding();
-
-    /**
-     * Returns the meta object for data type '{@link java.net.URL <em>URL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>URL</em>'.
-     * @see java.net.URL
-     * @model instanceClass="java.net.URL"
-     * @generated
-     */
-    EDataType getURL();
-
-    /**
-     * Returns the meta object for data type '{@link javax.wsdl.Definition <em>Definition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Definition</em>'.
-     * @see javax.wsdl.Definition
-     * @model instanceClass="javax.wsdl.Definition"
-     * @generated
-     */
-    EDataType getDefinition();
-
-    /**
-     * Returns the meta object for data type '{@link java.util.Map <em>Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Map</em>'.
-     * @see java.util.Map
-     * @model instanceClass="java.util.Map" typeParameters="T T1"
-     * @generated
-     */
-    EDataType getMap();
-
-    /**
-     * Returns the meta object for data type '{@link org.eclipse.jdt.core.IMethod <em>IMethod</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>IMethod</em>'.
-     * @see org.eclipse.jdt.core.IMethod
-     * @model instanceClass="org.eclipse.jdt.core.IMethod"
-     * @generated
-     */
-    EDataType getIMethod();
-
-    /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
-    CXFFactory getCXFFactory();
-
-    /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
-     * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
-     * </ul>
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    interface Literals {
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
-         * @generated
-         */
-        EClass CXF_CONTEXT = eINSTANCE.getCXFContext();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_LOCATION = eINSTANCE.getCXFContext_CxfRuntimeLocation();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Edition</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_EDITION = eINSTANCE.getCXFContext_CxfRuntimeEdition();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_VERSION = eINSTANCE.getCXFContext_CxfRuntimeVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Verbose</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__VERBOSE = eINSTANCE.getCXFContext_Verbose();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Ant Build File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = eINSTANCE.getCXFContext_GenerateAntBuildFile();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Client</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_CLIENT = eINSTANCE.getCXFContext_GenerateClient();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Server</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_SERVER = eINSTANCE.getCXFContext_GenerateServer();
-
-        /**
-         * The meta object literal for the '<em><b>Databinding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__DATABINDING = eINSTANCE.getCXFContext_Databinding();
-
-        /**
-         * The meta object literal for the '<em><b>Frontend</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__FRONTEND = eINSTANCE.getCXFContext_Frontend();
-
-        /**
-         * The meta object literal for the '<em><b>Use Spring Application Context</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = eINSTANCE.getCXFContext_UseSpringApplicationContext();
-
-        /**
-         * The meta object literal for the '<em><b>Export CXF Classpath Container</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = eINSTANCE.getCXFContext_ExportCXFClasspathContainer();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
-         * @generated
-         */
-        EClass CXF_DATA_MODEL = eINSTANCE.getCXFDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__PROJECT_NAME = eINSTANCE.getCXFDataModel_ProjectName();
-
-        /**
-         * The meta object literal for the '<em><b>Resource Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__RESOURCE_DIRECTORY = eINSTANCE.getCXFDataModel_ResourceDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Class Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CLASS_DIRECTORY = eINSTANCE.getCXFDataModel_ClassDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl File Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_FILE_NAME = eINSTANCE.getCXFDataModel_WsdlFileName();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl URL</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_URL = eINSTANCE.getCXFDataModel_WsdlURL();
-
-        /**
-         * The meta object literal for the '<em><b>Config Wsdl Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = eINSTANCE.getCXFDataModel_ConfigWsdlLocation();
-
-        /**
-         * The meta object literal for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaClassName();
-
-        /**
-         * The meta object literal for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
-        /**
-         * The meta object literal for the '<em><b>Config Id</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CONFIG_ID = eINSTANCE.getCXFDataModel_ConfigId();
-
-        /**
-         * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__TARGET_NAMESPACE = eINSTANCE.getCXFDataModel_TargetNamespace();
-
-        /**
-         * The meta object literal for the '<em><b>Endpoint Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__ENDPOINT_NAME = eINSTANCE.getCXFDataModel_EndpointName();
-
-        /**
-         * The meta object literal for the '<em><b>Service Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__SERVICE_NAME = eINSTANCE.getCXFDataModel_ServiceName();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Definition</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_DEFINITION = eINSTANCE.getCXFDataModel_WsdlDefinition();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_LOCATION = eINSTANCE.getCXFDataModel_WsdlLocation();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
-         * @generated
-         */
-        EClass JAVA2_WS_CONTEXT = eINSTANCE.getJava2WSContext();
-
-        /**
-         * The meta object literal for the '<em><b>Soap12 Binding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__SOAP12_BINDING = eINSTANCE.getJava2WSContext_Soap12Binding();
-
-        /**
-         * The meta object literal for the '<em><b>Generate XSD Imports</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = eINSTANCE.getJava2WSContext_GenerateXSDImports();
-
-        /**
-         * The meta object literal for the '<em><b>Generate WSDL</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WSDL = eINSTANCE.getJava2WSContext_GenerateWSDL();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans();
-
-        /**
-         * The meta object literal for the '<em><b>Annotation Processing Enabled</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Web Method Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Web Param Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
-         * @generated
-         */
-        EClass JAVA2_WS_DATA_MODEL = eINSTANCE.getJava2WSDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Classpath</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__CLASSPATH = eINSTANCE.getJava2WSDataModel_Classpath();
-
-        /**
-         * The meta object literal for the '<em><b>Java Starting Point</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = eINSTANCE.getJava2WSDataModel_JavaStartingPoint();
-
-        /**
-         * The meta object literal for the '<em><b>Use Service Endpoint Interface</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getJava2WSDataModel_UseServiceEndpointInterface();
-
-        /**
-         * The meta object literal for the '<em><b>Extract Interface</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = eINSTANCE.getJava2WSDataModel_ExtractInterface();
-
-        /**
-         * The meta object literal for the '<em><b>Service Endpoint Interface Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = eINSTANCE.getJava2WSDataModel_ServiceEndpointInterfaceName();
-
-        /**
-         * The meta object literal for the '<em><b>Method Map</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__METHOD_MAP = eINSTANCE.getJava2WSDataModel_MethodMap();
-
-        /**
-         * The meta object literal for the '<em><b>Annotation Map</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = eINSTANCE.getJava2WSDataModel_AnnotationMap();
-
-        /**
-         * The meta object literal for the '<em><b>Source Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = eINSTANCE.getJava2WSDataModel_SourceDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__PORT_NAME = eINSTANCE.getJava2WSDataModel_PortName();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
-         * @generated
-         */
-        EClass WSDL2_JAVA_CONTEXT = eINSTANCE.getWSDL2JavaContext();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Implementation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = eINSTANCE.getWSDL2JavaContext_GenerateImplementation();
-
-        /**
-         * The meta object literal for the '<em><b>Process SOAP Headers</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders();
-
-        /**
-         * The meta object literal for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Validate</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__VALIDATE = eINSTANCE.getWSDL2JavaContext_Validate();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__WSDL_VERSION = eINSTANCE.getWSDL2JavaContext_WsdlVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Use Default Values</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_UseDefaultValues();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Args</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_ARGS = eINSTANCE.getWSDL2JavaContext_XjcArgs();
-
-        /**
-         * The meta object literal for the '<em><b>No Address Binding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = eINSTANCE.getWSDL2JavaContext_NoAddressBinding();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Use Default Values</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING = eINSTANCE.getWSDL2JavaContext_XjcToString();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String Multi Line</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String Simple</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = eINSTANCE.getWSDL2JavaContext_XjcToStringSimple();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Locator</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_LOCATOR = eINSTANCE.getWSDL2JavaContext_XjcLocator();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Sync Methods</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = eINSTANCE.getWSDL2JavaContext_XjcSyncMethods();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Mark Generated</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Episode File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = eINSTANCE.getWSDL2JavaContext_XjcEpisodeFile();
-
-        /**
-         * The meta object literal for the '<em><b>Auto Name Resolution</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = eINSTANCE.getWSDL2JavaContext_AutoNameResolution();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
-         * @generated
-         */
-        EClass WSDL2_JAVA_DATA_MODEL = eINSTANCE.getWSDL2JavaDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Included Namespaces</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_IncludedNamespaces();
-
-        /**
-         * The meta object literal for the '<em><b>Binding Files</b></em>' attribute list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__BINDING_FILES = eINSTANCE.getWSDL2JavaDataModel_BindingFiles();
-
-        /**
-         * The meta object literal for the '<em><b>Excluded Namespaces</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_ExcludedNamespaces();
-
-        /**
-         * The meta object literal for the '<em><b>Catalog File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = eINSTANCE.getWSDL2JavaDataModel_CatalogFile();
-
-        /**
-         * The meta object literal for the '<em><b>Java Source Folder</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = eINSTANCE.getWSDL2JavaDataModel_JavaSourceFolder();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
-         * @generated
-         */
-        EEnum FRONTEND = eINSTANCE.getFrontend();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
-         * @generated
-         */
-        EEnum DATA_BINDING = eINSTANCE.getDataBinding();
-
-        /**
-         * The meta object literal for the '<em>URL</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.net.URL
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
-         * @generated
-         */
-        EDataType URL = eINSTANCE.getURL();
-
-        /**
-         * The meta object literal for the '<em>Definition</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see javax.wsdl.Definition
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
-         * @generated
-         */
-        EDataType DEFINITION = eINSTANCE.getDefinition();
-
-        /**
-         * The meta object literal for the '<em>Map</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.util.Map
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
-         * @generated
-         */
-        EDataType MAP = eINSTANCE.getMap();
-
-        /**
-         * The meta object literal for the '<em>IMethod</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jdt.core.IMethod
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
-         * @generated
-         */
-        EDataType IMETHOD = eINSTANCE.getIMethod();
-
-    }
-
-} //CXFPackage
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
deleted file mode 100644
index 6d1fb16..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: DataBinding.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Data Binding</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getDataBinding()
- * @model
- * @generated
- */
-public enum DataBinding implements Enumerator {
-    /**
-     * The '<em><b>JAXB</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #JAXB_VALUE
-     * @generated
-     * @ordered
-     */
-    JAXB(0, "JAXB", "jaxb");
-
-    /**
-     * The '<em><b>JAXB</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>JAXB</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #JAXB
-     * @model literal="jaxb"
-     * @generated
-     * @ordered
-     */
-    public static final int JAXB_VALUE = 0;
-
-    /**
-     * An array of all the '<em><b>Data Binding</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static final DataBinding[] VALUES_ARRAY =
-        new DataBinding[] {
-            JAXB,
-        };
-
-    /**
-     * A public read-only list of all the '<em><b>Data Binding</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final List<DataBinding> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding get(String literal) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            DataBinding result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding getByName(String name) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            DataBinding result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding get(int value) {
-        switch (value) {
-            case JAXB_VALUE: return JAXB;
-        }
-        return null;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final int value;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String name;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String literal;
-
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private DataBinding(int value, String name, String literal) {
-        this.value = value;
-        this.name = name;
-        this.literal = literal;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int getValue() {
-      return value;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-      return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getLiteral() {
-      return literal;
-    }
-
-    /**
-     * Returns the literal value of the enumerator, which is its string representation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        return literal;
-    }
-    
-} //DataBinding
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
deleted file mode 100644
index 44a9a0e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: Frontend.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Frontend</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getFrontend()
- * @model
- * @generated
- */
-public enum Frontend implements Enumerator {
-    /**
-     * The '<em><b>JAXWS</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #JAXWS_VALUE
-     * @generated
-     * @ordered
-     */
-    JAXWS(0, "JAXWS", "jaxws");
-
-    /**
-     * The '<em><b>JAXWS</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>JAXWS</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #JAXWS
-     * @model literal="jaxws"
-     * @generated
-     * @ordered
-     */
-    public static final int JAXWS_VALUE = 0;
-
-    /**
-     * An array of all the '<em><b>Frontend</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static final Frontend[] VALUES_ARRAY =
-        new Frontend[] {
-            JAXWS,
-        };
-
-    /**
-     * A public read-only list of all the '<em><b>Frontend</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final List<Frontend> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend get(String literal) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Frontend result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend getByName(String name) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Frontend result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend get(int value) {
-        switch (value) {
-            case JAXWS_VALUE: return JAXWS;
-        }
-        return null;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final int value;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String name;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String literal;
-
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private Frontend(int value, String name, String literal) {
-        this.value = value;
-        this.name = name;
-        this.literal = literal;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int getValue() {
-      return value;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-      return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getLiteral() {
-      return literal;
-    }
-
-    /**
-     * Returns the literal value of the enumerator, which is its string representation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        return literal;
-    }
-    
-} //Frontend
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java
deleted file mode 100644
index 9149d7d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-/**
- * 
- * @model abstract="true" interface="true"
- */
-public interface Java2WSContext extends CXFContext {
-    /**
-     * Returns whether the generated WSDL is to include a SOAP 1.2 binding.
-     * 
-     * @model default="false"
-     */
-    boolean isSoap12Binding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies that the generated WSDL is to include a SOAP 1.2 binding.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Soap12 Binding</em>' attribute.
-     * @see #isSoap12Binding()
-     * @generated
-     */
-    void setSoap12Binding(boolean value);
-
-    /**
-     * Returns whether to output schemas to separate files and use imports to
-     * load them instead of inlining them into the wsdl.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateXSDImports();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Output schemas to separate files and use imports to load them instead of
-     * inlining them into the wsdl.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate XSD Imports</em>' attribute.
-     * @see #isGenerateXSDImports()
-     * @generated
-     */
-    void setGenerateXSDImports(boolean value);
-
-    /**
-     * Returns whether to generate wsdl.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWSDL();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate the WSDL file.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate WSDL</em>' attribute.
-     * @see #isGenerateWSDL()
-     * @generated
-     */
-    void setGenerateWSDL(boolean value);
-
-    /**
-     * Returns whether to generate wrapper beans.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWrapperFaultBeans();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate the wrapper and fault bean.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Wrapper Fault Beans</em>' attribute.
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     */
-    void setGenerateWrapperFaultBeans(boolean value);
-
-    /**
-     * Returns whether the Annotation Processing Tool (APT) is enabled.
-     * 
-     * @model default="false"
-     */
-    boolean isAnnotationProcessingEnabled();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Set to enable the Annotation Processing Tool (APT) extension.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Annotation Processing Enabled</em>' attribute.
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     */
-    void setAnnotationProcessingEnabled(boolean value);
-
-    /**
-     * Returns whether the <code>@WebMethod</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWebMethodAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@WebMethod</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Web Method Annotation</em>' attribute.
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     */
-    void setGenerateWebMethodAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@WebParam</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWebParamAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@WebParam</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Web Param Annotation</em>' attribute.
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     */
-    void setGenerateWebParamAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@RequestWrapper</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateRequestWrapperAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@RequestWrapper</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Request Wrapper Annotation</em>' attribute.
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     */
-    void setGenerateRequestWrapperAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@ResponseWrapper</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateResponseWrapperAnnotation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@ResponseWrapper</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Response Wrapper Annotation</em>' attribute.
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     */
-    void setGenerateResponseWrapperAnnotation(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java
deleted file mode 100644
index bcf6c67..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-
-/**
- * 
- * @model
- */
-public interface Java2WSDataModel extends CXFDataModel, Java2WSContext {
-    /**
-     * Returns the classpath searched when processing.
-     * 
-     * @model
-     */
-    String getClasspath();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the classpath to search when processing.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Classpath</em>' attribute.
-     * @see #getClasspath()
-     * @generated
-     */
-    void setClasspath(String value);
-
-    /**
-     * Returns the Java starting point artifact. This can be either a Java Class or Interface.
-     * 
-     * @model
-     */
-    String getJavaStartingPoint();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the Java starting point artifact. It may be a Java Class or Interface.
-     * @see #setFullyQualifiedJavaClassName()
-     * @see #setFullyQualifiedJavaInterfaceName()
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Java Starting Point</em>' attribute.
-     * @see #getJavaStartingPoint()
-     * @generated
-     */
-    void setJavaStartingPoint(String value);
-
-    /**
-     * If the starting point is a Java Class this tracks whether to use an SEI has been selected.
-     * 
-     * @model
-     */
-    boolean isUseServiceEndpointInterface();
-
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Service Endpoint Interface</em>' attribute.
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     */
-    void setUseServiceEndpointInterface(boolean value);
-
-    /**
-     * If the starting point is a Java Class this tracks whether to option to
-     * extract the SEI has been selected.
-     * 
-     * @model
-     */
-    boolean isExtractInterface();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the option to extract the SEI from the Java class starting point.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Extract Interface</em>' attribute.
-     * @see #isExtractInterface()
-     * @generated
-     */
-    void setExtractInterface(boolean value);
-
-    /**
-     * Gets the new SEI name.
-     * 
-     * @model
-     */
-    String getServiceEndpointInterfaceName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Service Endpoint Interface Name</em>' attribute.
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     */
-    void setServiceEndpointInterfaceName(String value);
-
-    /**
-     * Returns the map of the methods to use and their annotations.
-     * 
-     * @model
-     */
-    Map<IMethod, Map<String, Boolean>> getMethodMap();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the map of the methods to use and the method annotations.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Method Map</em>' attribute.
-     * @see #getMethodMap()
-     * @generated
-     */
-    void setMethodMap(Map<IMethod, Map<String, Boolean>> value);
-
-    /**
-     * Returns a map of enabled default method annotations
-     * 
-     * @model
-     */
-    Map<String, Boolean> getAnnotationMap();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets a map of the enabled method annotations.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Annotation Map</em>' attribute.
-     * @see #getAnnotationMap()
-     * @generated
-     */
-    void setAnnotationMap(Map<String, Boolean> value);
-
-    /**
-     * Returns the directory in which the generated source files are placed.
-     * 
-     * @model
-     */
-    String getSourceDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the directory in which the generated source files are placed.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Source Directory</em>' attribute.
-     * @see #getSourceDirectory()
-     * @generated
-     */
-    void setSourceDirectory(String value);
-
-    /**
-     * Returns the port name used in the generated wsdl.
-     * 
-     * @model
-     */
-    String getPortName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the port name to use in the generated wsdl.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Port Name</em>' attribute.
-     * @see #getPortName()
-     * @generated
-     */
-    void setPortName(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
deleted file mode 100644
index 716a16a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-/**
- * 
- * @model abstract="true" interface="true"
- */
-public interface WSDL2JavaContext extends CXFContext {
-
-    /**
-     * Returns whether to generate starting point code for an implementation object.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateImplementation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies whether to generate starting point code for an implementation object.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Implementation</em>' attribute.
-     * @see #isGenerateImplementation()
-     * @generated
-     */
-    void setGenerateImplementation(boolean value);
-
-    /**
-     * Returns whether processing of implicit SOAP headers (i.e. SOAP headers
-     * defined in the wsdl:binding but not wsdl:portType section.) is enabled.
-     * 
-     * @model default="false"
-     */
-    boolean isProcessSOAPHeaders();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables or disables processing of implicit SOAP headers (i.e. SOAP
-     * headers defined in the wsdl:binding but not wsdl:portType section.)
-     * Default is false.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Process SOAP Headers</em>' attribute.
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     */
-    void setProcessSOAPHeaders(boolean value);
-
-    /**
-     * Returns whether the loading of the default namespace package name mapping is enabled. 
-     * Default is true.
-     * 
-     * @model default="true"
-     */
-    boolean isLoadDefaultNamespacePackageNameMapping();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables the use of the default namespace package name mapping.
-     * Default is true.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Load Default Namespace Package Name Mapping</em>' attribute.
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     */
-    void setLoadDefaultNamespacePackageNameMapping(boolean value);
-
-    /**
-     * Returns whether the loading of the default excludes namespace mapping is enabled.
-     * Default is true.
-     * 
-     * @model default="true"
-     */
-    boolean isLoadDefaultExcludesNamepsaceMapping();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables the use of the default excludes namespace mapping.
-     * Default is true.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Load Default Excludes Namepsace Mapping</em>' attribute.
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     */
-    void setLoadDefaultExcludesNamepsaceMapping(boolean value);
-
-    /**
-     * Returns whether to validate the WSDL before generating the code.
-     * 
-     * @model default="true"
-     */
-    boolean isValidate();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables WSDL validation before code generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Validate</em>' attribute.
-     * @see #isValidate()
-     * @generated
-     */
-    void setValidate(boolean value);
-
-    /**
-     * Returns the wsdl version .Default is WSDL1.1. Currently supports only WSDL1.1 version.
-     * 
-     * @model default="1.1"
-     */
-    String getWsdlVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Version</em>' attribute.
-     * @see #getWsdlVersion()
-     * @generated
-     */
-    void setWsdlVersion(String value);
-
-    /**
-     * Returns whether the tool is set to generate default vales for the
-     * generated client and the generated implementation.
-     *
-     * @model default="true"
-     */
-    boolean isUseDefaultValues();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Generate default vales for the generated client and the generated implementation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Default Values</em>' attribute.
-     * @see #isUseDefaultValues()
-     * @generated
-     */
-    void setUseDefaultValues(boolean value);
-
-    /**
-     * Returns the comma separated list of arguments to be passed directly to
-     * the XJC when the JAXB binding is being used.
-     * 
-     * @model
-     */
-    String getXjcArgs();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Args</em>' attribute.
-     * @see #getXjcArgs()
-     * @generated
-     */
-    void setXjcArgs(String value);
-
-    /**
-     * Returns whether the tool is set to use the CXF proprietary WS-Addressing 
-     * type instead of the JAX-WS 2.1 compliant mapping.
-     * 
-     * @model
-     */
-    boolean isNoAddressBinding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Instructs the tool to use the CXF proprietary WS-Addressing type 
-     * instead of the JAX-WS 2.1 compliant mapping.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>No Address Binding</em>' attribute.
-     * @see #isNoAddressBinding()
-     * @generated
-     */
-    void setNoAddressBinding(boolean value);
-
-    /**
-     * Returns whether XJC will initialize fields mapped from elements with their default values.
-     * 
-     * @model
-     */
-    boolean isXjcUseDefaultValues();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Use Default Values</em>' attribute.
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     */
-    void setXjcUseDefaultValues(boolean value);
-
-    /**
-     * Returns whether XJC will generate a <code>toString()</code> method.
-     * 
-     * @model
-     */
-    boolean isXjcToString();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String</em>' attribute.
-     * @see #isXjcToString()
-     * @generated
-     */
-    void setXjcToString(boolean value);
-
-    /**
-     * Returns whether multi line output is enabled for <code>toString()</code>.
-     * 
-     * @model
-     */
-    boolean isXjcToStringMultiLine();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String Multi Line</em>' attribute.
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     */
-    void setXjcToStringMultiLine(boolean value);
-
-    /**
-     * Returns whether terse output is enabled for <code>toString()</code>.
-     * 
-     * @model
-     */
-    boolean isXjcToStringSimple();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String Simple</em>' attribute.
-     * @see #isXjcToStringSimple()
-     * @generated
-     */
-    void setXjcToStringSimple(boolean value);
-
-    /**
-     * Returns whether source location support is enabled.
-     * @model
-     */
-    boolean isXjcLocator();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Locator</em>' attribute.
-     * @see #isXjcLocator()
-     * @generated
-     */
-    void setXjcLocator(boolean value);
-
-    /**
-     * Returns whether the XJC will generate accessor methods with 'synchronized' keyword.
-     * 
-     * @model
-     */
-    boolean isXjcSyncMethods();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Sync Methods</em>' attribute.
-     * @see #isXjcSyncMethods()
-     * @generated
-     */
-    void setXjcSyncMethods(boolean value);
-
-    /**
-     * Returns whether the XJC will mark the code as generated using the annotations.
-     * 
-     * @model
-     */
-    boolean isXjcMarkGenerated();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Mark Generated</em>' attribute.
-     * @see #isXjcMarkGenerated()
-     * @generated
-     */
-    void setXjcMarkGenerated(boolean value);
-
-    /**
-     * The episode file location.
-     * 
-     * @model
-     */
-    String getXjcEpisodeFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Episode File</em>' attribute.
-     * @see #getXjcEpisodeFile()
-     * @generated
-     */
-    void setXjcEpisodeFile(String value);
-
-    /**
-     * Returns the value of the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * The default value is <code>"false"</code>.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Auto Name Resolution</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Auto Name Resolution</em>' attribute.
-     * @see #setAutoNameResolution(boolean)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getWSDL2JavaContext_AutoNameResolution()
-     * @model default="false"
-     * @generated
-     */
-    boolean isAutoNameResolution();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Auto Name Resolution</em>' attribute.
-     * @see #isAutoNameResolution()
-     * @generated
-     */
-    void setAutoNameResolution(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java
deleted file mode 100644
index 7e189c5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Map;
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @model
- */
-public interface WSDL2JavaDataModel extends CXFDataModel, WSDL2JavaContext {
-    /**
-     * Returns the package names to use for the generated code.
-     * 
-     * @model
-     */
-    Map<String, String> getIncludedNamespaces();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies zero, or more, package names to use for the generated code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Included Namespaces</em>' attribute.
-     * @see #getIncludedNamespaces()
-     * @generated
-     */
-    void setIncludedNamespaces(Map<String, String> value);
-
-    /**
-     * Returns a List of the JAXWS or JAXB binding files used, if any.
-     * 
-     * @model
-     */
-    EList<String> getBindingFiles();
-
-    /**
-     * Returns the java package to excluded namespace mappings.
-     * 
-     * @model
-     */
-    Map<String, String> getExcludedNamespaces();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Ignore the specified WSDL schema namespace when generating code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Excluded Namespaces</em>' attribute.
-     * @see #getExcludedNamespaces()
-     * @generated
-     */
-    void setExcludedNamespaces(Map<String, String> value);
-
-    /**
-     * Returns the catalog file used to map the imported wsdl/schema
-     * @model
-     */
-    String getCatalogFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify catalog file to map the imported wsdl/schema.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Catalog File</em>' attribute.
-     * @see #getCatalogFile()
-     * @generated
-     */
-    void setCatalogFile(String value);
-
-    /**
-     * Returns the value of the Java Source Directory into which the files are generated.
-     * 
-     * @model
-     */
-    String getJavaSourceFolder();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the value of the Java Source Directory into which the files are generated.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Java Source Folder</em>' attribute.
-     * @see #getJavaSourceFolder()
-     * @generated
-     */
-    void setJavaSourceFolder(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
deleted file mode 100644
index 8ca9da2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
+++ /dev/null
@@ -1,1475 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFDataModelImpl.java,v 1.3 2009/01/29 21:46:59 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isVerbose <em>Verbose</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateAntBuildFile <em>Generate Ant Build File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateClient <em>Generate Client</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateServer <em>Generate Server</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getDatabinding <em>Databinding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFrontend <em>Frontend</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isUseSpringApplicationContext <em>Use Spring Application Context</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getProjectName <em>Project Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getResourceDirectory <em>Resource Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getClassDirectory <em>Class Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlFileName <em>Wsdl File Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlURL <em>Wsdl URL</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigWsdlLocation <em>Config Wsdl Location</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigId <em>Config Id</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getEndpointName <em>Endpoint Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getServiceName <em>Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlDefinition <em>Wsdl Definition</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlLocation <em>Wsdl Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class CXFDataModelImpl extends EObjectImpl implements CXFDataModel {
-    /**
-     * The default value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeLocation = CXF_RUNTIME_LOCATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_EDITION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeEdition = CXF_RUNTIME_EDITION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_VERSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeVersion = CXF_RUNTIME_VERSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isVerbose()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean VERBOSE_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isVerbose()
-     * @generated
-     * @ordered
-     */
-    protected boolean verbose = VERBOSE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_ANT_BUILD_FILE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateAntBuildFile = GENERATE_ANT_BUILD_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateClient()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_CLIENT_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateClient()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateClient = GENERATE_CLIENT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateServer()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_SERVER_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateServer()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateServer = GENERATE_SERVER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDatabinding()
-     * @generated
-     * @ordered
-     */
-    protected static final DataBinding DATABINDING_EDEFAULT = DataBinding.JAXB;
-
-    /**
-     * The cached value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDatabinding()
-     * @generated
-     * @ordered
-     */
-    protected DataBinding databinding = DATABINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFrontend()
-     * @generated
-     * @ordered
-     */
-    protected static final Frontend FRONTEND_EDEFAULT = Frontend.JAXWS;
-
-    /**
-     * The cached value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFrontend()
-     * @generated
-     * @ordered
-     */
-    protected Frontend frontend = FRONTEND_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_SPRING_APPLICATION_CONTEXT_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     * @ordered
-     */
-    protected boolean useSpringApplicationContext = USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     * @ordered
-     */
-    protected boolean exportCXFClasspathContainer = EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProjectName()
-     * @generated
-     * @ordered
-     */
-    protected static final String PROJECT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProjectName()
-     * @generated
-     * @ordered
-     */
-    protected String projectName = PROJECT_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getResourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String RESOURCE_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getResourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String resourceDirectory = RESOURCE_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClassDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String CLASS_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClassDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String classDirectory = CLASS_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlFileName()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_FILE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlFileName()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlFileName = WSDL_FILE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlURL()
-     * @generated
-     * @ordered
-     */
-    protected static final URL WSDL_URL_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlURL()
-     * @generated
-     * @ordered
-     */
-    protected URL wsdlURL = WSDL_URL_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String CONFIG_WSDL_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected String configWsdlLocation = CONFIG_WSDL_LOCATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     * @ordered
-     */
-    protected static final String FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     * @ordered
-     */
-    protected String fullyQualifiedJavaClassName = FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected String fullyQualifiedJavaInterfaceName = FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigId()
-     * @generated
-     * @ordered
-     */
-    protected static final String CONFIG_ID_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigId()
-     * @generated
-     * @ordered
-     */
-    protected String configId = CONFIG_ID_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTargetNamespace()
-     * @generated
-     * @ordered
-     */
-    protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTargetNamespace()
-     * @generated
-     * @ordered
-     */
-    protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEndpointName()
-     * @generated
-     * @ordered
-     */
-    protected static final String ENDPOINT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEndpointName()
-     * @generated
-     * @ordered
-     */
-    protected String endpointName = ENDPOINT_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String SERVICE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceName()
-     * @generated
-     * @ordered
-     */
-    protected String serviceName = SERVICE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlDefinition()
-     * @generated
-     * @ordered
-     */
-    protected static final Definition WSDL_DEFINITION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlDefinition()
-     * @generated
-     * @ordered
-     */
-    protected Definition wsdlDefinition = WSDL_DEFINITION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlLocation = WSDL_LOCATION_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected CXFDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.CXF_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeLocation() {
-        return cxfRuntimeLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeLocation(String newCxfRuntimeLocation) {
-        String oldCxfRuntimeLocation = cxfRuntimeLocation;
-        cxfRuntimeLocation = newCxfRuntimeLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION, oldCxfRuntimeLocation, cxfRuntimeLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeEdition() {
-        return cxfRuntimeEdition;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeEdition(String newCxfRuntimeEdition) {
-        String oldCxfRuntimeEdition = cxfRuntimeEdition;
-        cxfRuntimeEdition = newCxfRuntimeEdition;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION, oldCxfRuntimeEdition, cxfRuntimeEdition));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeVersion() {
-        return cxfRuntimeVersion;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeVersion(String newCxfRuntimeVersion) {
-        String oldCxfRuntimeVersion = cxfRuntimeVersion;
-        cxfRuntimeVersion = newCxfRuntimeVersion;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION, oldCxfRuntimeVersion, cxfRuntimeVersion));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setVerbose(boolean newVerbose) {
-        boolean oldVerbose = verbose;
-        verbose = newVerbose;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__VERBOSE, oldVerbose, verbose));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateAntBuildFile() {
-        return generateAntBuildFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateAntBuildFile(boolean newGenerateAntBuildFile) {
-        boolean oldGenerateAntBuildFile = generateAntBuildFile;
-        generateAntBuildFile = newGenerateAntBuildFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE, oldGenerateAntBuildFile, generateAntBuildFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateClient() {
-        return generateClient;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateClient(boolean newGenerateClient) {
-        boolean oldGenerateClient = generateClient;
-        generateClient = newGenerateClient;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT, oldGenerateClient, generateClient));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateServer() {
-        return generateServer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateServer(boolean newGenerateServer) {
-        boolean oldGenerateServer = generateServer;
-        generateServer = newGenerateServer;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER, oldGenerateServer, generateServer));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public DataBinding getDatabinding() {
-        return databinding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setDatabinding(DataBinding newDatabinding) {
-        DataBinding oldDatabinding = databinding;
-        databinding = newDatabinding == null ? DATABINDING_EDEFAULT : newDatabinding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__DATABINDING, oldDatabinding, databinding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Frontend getFrontend() {
-        return frontend;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFrontend(Frontend newFrontend) {
-        Frontend oldFrontend = frontend;
-        frontend = newFrontend == null ? FRONTEND_EDEFAULT : newFrontend;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FRONTEND, oldFrontend, frontend));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseSpringApplicationContext() {
-        return useSpringApplicationContext;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseSpringApplicationContext(boolean newUseSpringApplicationContext) {
-        boolean oldUseSpringApplicationContext = useSpringApplicationContext;
-        useSpringApplicationContext = newUseSpringApplicationContext;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT, oldUseSpringApplicationContext, useSpringApplicationContext));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isExportCXFClasspathContainer() {
-        return exportCXFClasspathContainer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExportCXFClasspathContainer(boolean newExportCXFClasspathContainer) {
-        boolean oldExportCXFClasspathContainer = exportCXFClasspathContainer;
-        exportCXFClasspathContainer = newExportCXFClasspathContainer;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER, oldExportCXFClasspathContainer, exportCXFClasspathContainer));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getProjectName() {
-        return projectName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setProjectName(String newProjectName) {
-        String oldProjectName = projectName;
-        projectName = newProjectName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__PROJECT_NAME, oldProjectName, projectName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getResourceDirectory() {
-        return resourceDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setResourceDirectory(String newResourceDirectory) {
-        String oldResourceDirectory = resourceDirectory;
-        resourceDirectory = newResourceDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY, oldResourceDirectory, resourceDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getClassDirectory() {
-        return classDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setClassDirectory(String newClassDirectory) {
-        String oldClassDirectory = classDirectory;
-        classDirectory = newClassDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY, oldClassDirectory, classDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlFileName() {
-        return wsdlFileName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlFileName(String newWsdlFileName) {
-        String oldWsdlFileName = wsdlFileName;
-        wsdlFileName = newWsdlFileName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME, oldWsdlFileName, wsdlFileName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public URL getWsdlURL() {
-        return wsdlURL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlURL(URL newWsdlURL) {
-        URL oldWsdlURL = wsdlURL;
-        wsdlURL = newWsdlURL;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_URL, oldWsdlURL, wsdlURL));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getConfigWsdlLocation() {
-        return configWsdlLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setConfigWsdlLocation(String newConfigWsdlLocation) {
-        String oldConfigWsdlLocation = configWsdlLocation;
-        configWsdlLocation = newConfigWsdlLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION, oldConfigWsdlLocation, configWsdlLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getFullyQualifiedJavaClassName() {
-        return fullyQualifiedJavaClassName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFullyQualifiedJavaClassName(String newFullyQualifiedJavaClassName) {
-        String oldFullyQualifiedJavaClassName = fullyQualifiedJavaClassName;
-        fullyQualifiedJavaClassName = newFullyQualifiedJavaClassName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME, oldFullyQualifiedJavaClassName, fullyQualifiedJavaClassName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getFullyQualifiedJavaInterfaceName() {
-        return fullyQualifiedJavaInterfaceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFullyQualifiedJavaInterfaceName(String newFullyQualifiedJavaInterfaceName) {
-        String oldFullyQualifiedJavaInterfaceName = fullyQualifiedJavaInterfaceName;
-        fullyQualifiedJavaInterfaceName = newFullyQualifiedJavaInterfaceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME, oldFullyQualifiedJavaInterfaceName, fullyQualifiedJavaInterfaceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getConfigId() {
-        return configId;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setConfigId(String newConfigId) {
-        String oldConfigId = configId;
-        configId = newConfigId;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_ID, oldConfigId, configId));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getTargetNamespace() {
-        return targetNamespace;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setTargetNamespace(String newTargetNamespace) {
-        String oldTargetNamespace = targetNamespace;
-        targetNamespace = newTargetNamespace;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getEndpointName() {
-        return endpointName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setEndpointName(String newEndpointName) {
-        String oldEndpointName = endpointName;
-        endpointName = newEndpointName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME, oldEndpointName, endpointName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setServiceName(String newServiceName) {
-        String oldServiceName = serviceName;
-        serviceName = newServiceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__SERVICE_NAME, oldServiceName, serviceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Definition getWsdlDefinition() {
-        return wsdlDefinition;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlDefinition(Definition newWsdlDefinition) {
-        Definition oldWsdlDefinition = wsdlDefinition;
-        wsdlDefinition = newWsdlDefinition;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION, oldWsdlDefinition, wsdlDefinition));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlLocation() {
-        return wsdlLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlLocation(String newWsdlLocation) {
-        String oldWsdlLocation = wsdlLocation;
-        wsdlLocation = newWsdlLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION, oldWsdlLocation, wsdlLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                return getCxfRuntimeLocation();
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                return getCxfRuntimeEdition();
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                return getCxfRuntimeVersion();
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                return isVerbose() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                return isGenerateAntBuildFile() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                return isGenerateClient() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                return isGenerateServer() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                return getDatabinding();
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                return getFrontend();
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                return isUseSpringApplicationContext() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                return isExportCXFClasspathContainer() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                return getProjectName();
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                return getResourceDirectory();
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                return getClassDirectory();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                return getWsdlFileName();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                return getWsdlURL();
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                return getConfigWsdlLocation();
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                return getFullyQualifiedJavaClassName();
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                return getFullyQualifiedJavaInterfaceName();
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                return getConfigId();
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                return getTargetNamespace();
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                return getEndpointName();
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                return getServiceName();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                return getWsdlDefinition();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                return getWsdlLocation();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                setCxfRuntimeLocation((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                setCxfRuntimeEdition((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                setCxfRuntimeVersion((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                setVerbose(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                setGenerateAntBuildFile(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                setGenerateClient(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                setGenerateServer(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                setDatabinding((DataBinding)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                setFrontend((Frontend)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                setUseSpringApplicationContext(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                setExportCXFClasspathContainer(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                setProjectName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                setResourceDirectory((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                setClassDirectory((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                setWsdlFileName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                setWsdlURL((URL)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                setConfigWsdlLocation((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                setFullyQualifiedJavaClassName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                setFullyQualifiedJavaInterfaceName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                setConfigId((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                setTargetNamespace((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                setEndpointName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                setServiceName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                setWsdlDefinition((Definition)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                setWsdlLocation((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                setCxfRuntimeLocation(CXF_RUNTIME_LOCATION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                setCxfRuntimeEdition(CXF_RUNTIME_EDITION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                setCxfRuntimeVersion(CXF_RUNTIME_VERSION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                setVerbose(VERBOSE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                setGenerateAntBuildFile(GENERATE_ANT_BUILD_FILE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                setGenerateClient(GENERATE_CLIENT_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                setGenerateServer(GENERATE_SERVER_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                setDatabinding(DATABINDING_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                setFrontend(FRONTEND_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                setUseSpringApplicationContext(USE_SPRING_APPLICATION_CONTEXT_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                setExportCXFClasspathContainer(EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                setProjectName(PROJECT_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                setResourceDirectory(RESOURCE_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                setClassDirectory(CLASS_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                setWsdlFileName(WSDL_FILE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                setWsdlURL(WSDL_URL_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                setConfigWsdlLocation(CONFIG_WSDL_LOCATION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                setFullyQualifiedJavaClassName(FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                setFullyQualifiedJavaInterfaceName(FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                setConfigId(CONFIG_ID_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                setEndpointName(ENDPOINT_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                setServiceName(SERVICE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                setWsdlDefinition(WSDL_DEFINITION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                setWsdlLocation(WSDL_LOCATION_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                return CXF_RUNTIME_LOCATION_EDEFAULT == null ? cxfRuntimeLocation != null : !CXF_RUNTIME_LOCATION_EDEFAULT.equals(cxfRuntimeLocation);
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                return CXF_RUNTIME_EDITION_EDEFAULT == null ? cxfRuntimeEdition != null : !CXF_RUNTIME_EDITION_EDEFAULT.equals(cxfRuntimeEdition);
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                return CXF_RUNTIME_VERSION_EDEFAULT == null ? cxfRuntimeVersion != null : !CXF_RUNTIME_VERSION_EDEFAULT.equals(cxfRuntimeVersion);
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                return verbose != VERBOSE_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                return generateAntBuildFile != GENERATE_ANT_BUILD_FILE_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                return generateClient != GENERATE_CLIENT_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                return generateServer != GENERATE_SERVER_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                return databinding != DATABINDING_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                return frontend != FRONTEND_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                return useSpringApplicationContext != USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                return exportCXFClasspathContainer != EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                return RESOURCE_DIRECTORY_EDEFAULT == null ? resourceDirectory != null : !RESOURCE_DIRECTORY_EDEFAULT.equals(resourceDirectory);
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                return CLASS_DIRECTORY_EDEFAULT == null ? classDirectory != null : !CLASS_DIRECTORY_EDEFAULT.equals(classDirectory);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                return WSDL_FILE_NAME_EDEFAULT == null ? wsdlFileName != null : !WSDL_FILE_NAME_EDEFAULT.equals(wsdlFileName);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                return WSDL_URL_EDEFAULT == null ? wsdlURL != null : !WSDL_URL_EDEFAULT.equals(wsdlURL);
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                return CONFIG_WSDL_LOCATION_EDEFAULT == null ? configWsdlLocation != null : !CONFIG_WSDL_LOCATION_EDEFAULT.equals(configWsdlLocation);
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                return FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT == null ? fullyQualifiedJavaClassName != null : !FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT.equals(fullyQualifiedJavaClassName);
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                return FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT == null ? fullyQualifiedJavaInterfaceName != null : !FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT.equals(fullyQualifiedJavaInterfaceName);
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                return CONFIG_ID_EDEFAULT == null ? configId != null : !CONFIG_ID_EDEFAULT.equals(configId);
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                return ENDPOINT_NAME_EDEFAULT == null ? endpointName != null : !ENDPOINT_NAME_EDEFAULT.equals(endpointName);
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                return WSDL_DEFINITION_EDEFAULT == null ? wsdlDefinition != null : !WSDL_DEFINITION_EDEFAULT.equals(wsdlDefinition);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                return WSDL_LOCATION_EDEFAULT == null ? wsdlLocation != null : !WSDL_LOCATION_EDEFAULT.equals(wsdlLocation);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (cxfRuntimeLocation: ");
-        result.append(cxfRuntimeLocation);
-        result.append(", cxfRuntimeEdition: ");
-        result.append(cxfRuntimeEdition);
-        result.append(", cxfRuntimeVersion: ");
-        result.append(cxfRuntimeVersion);
-        result.append(", verbose: ");
-        result.append(verbose);
-        result.append(", generateAntBuildFile: ");
-        result.append(generateAntBuildFile);
-        result.append(", generateClient: ");
-        result.append(generateClient);
-        result.append(", generateServer: ");
-        result.append(generateServer);
-        result.append(", databinding: ");
-        result.append(databinding);
-        result.append(", frontend: ");
-        result.append(frontend);
-        result.append(", useSpringApplicationContext: ");
-        result.append(useSpringApplicationContext);
-        result.append(", exportCXFClasspathContainer: ");
-        result.append(exportCXFClasspathContainer);
-        result.append(", projectName: ");
-        result.append(projectName);
-        result.append(", resourceDirectory: ");
-        result.append(resourceDirectory);
-        result.append(", classDirectory: ");
-        result.append(classDirectory);
-        result.append(", wsdlFileName: ");
-        result.append(wsdlFileName);
-        result.append(", wsdlURL: ");
-        result.append(wsdlURL);
-        result.append(", configWsdlLocation: ");
-        result.append(configWsdlLocation);
-        result.append(", fullyQualifiedJavaClassName: ");
-        result.append(fullyQualifiedJavaClassName);
-        result.append(", fullyQualifiedJavaInterfaceName: ");
-        result.append(fullyQualifiedJavaInterfaceName);
-        result.append(", configId: ");
-        result.append(configId);
-        result.append(", targetNamespace: ");
-        result.append(targetNamespace);
-        result.append(", endpointName: ");
-        result.append(endpointName);
-        result.append(", serviceName: ");
-        result.append(serviceName);
-        result.append(", wsdlDefinition: ");
-        result.append(wsdlDefinition);
-        result.append(", wsdlLocation: ");
-        result.append(wsdlLocation);
-        result.append(')');
-        return result.toString();
-    }
-
-} //CXFDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
deleted file mode 100644
index 7c51630..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFFactoryImpl.java,v 1.1 2008/11/10 20:37:42 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFFactoryImpl extends EFactoryImpl implements CXFFactory {
-    /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static CXFFactory init() {
-        try {
-            CXFFactory theCXFFactory = (CXFFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore"); 
-            if (theCXFFactory != null) {
-                return theCXFFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new CXFFactoryImpl();
-    }
-
-    /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFFactoryImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EObject create(EClass eClass) {
-        switch (eClass.getClassifierID()) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL: return (EObject)createJava2WSDataModel();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL: return (EObject)createWSDL2JavaDataModel();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object createFromString(EDataType eDataType, String initialValue) {
-        switch (eDataType.getClassifierID()) {
-            case CXFPackage.FRONTEND:
-                return createFrontendFromString(eDataType, initialValue);
-            case CXFPackage.DATA_BINDING:
-                return createDataBindingFromString(eDataType, initialValue);
-            case CXFPackage.URL:
-                return createURLFromString(eDataType, initialValue);
-            case CXFPackage.DEFINITION:
-                return createDefinitionFromString(eDataType, initialValue);
-            case CXFPackage.MAP:
-                return createMapFromString(eDataType, initialValue);
-            case CXFPackage.IMETHOD:
-                return createIMethodFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String convertToString(EDataType eDataType, Object instanceValue) {
-        switch (eDataType.getClassifierID()) {
-            case CXFPackage.FRONTEND:
-                return convertFrontendToString(eDataType, instanceValue);
-            case CXFPackage.DATA_BINDING:
-                return convertDataBindingToString(eDataType, instanceValue);
-            case CXFPackage.URL:
-                return convertURLToString(eDataType, instanceValue);
-            case CXFPackage.DEFINITION:
-                return convertDefinitionToString(eDataType, instanceValue);
-            case CXFPackage.MAP:
-                return convertMapToString(eDataType, instanceValue);
-            case CXFPackage.IMETHOD:
-                return convertIMethodToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Java2WSDataModel createJava2WSDataModel() {
-        Java2WSDataModelImpl java2WSDataModel = new Java2WSDataModelImpl();
-        return java2WSDataModel;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDL2JavaDataModel createWSDL2JavaDataModel() {
-        WSDL2JavaDataModelImpl wsdl2JavaDataModel = new WSDL2JavaDataModelImpl();
-        return wsdl2JavaDataModel;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Frontend createFrontendFromString(EDataType eDataType, String initialValue) {
-        Frontend result = Frontend.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertFrontendToString(EDataType eDataType, Object instanceValue) {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public DataBinding createDataBindingFromString(EDataType eDataType, String initialValue) {
-        DataBinding result = DataBinding.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertDataBindingToString(EDataType eDataType, Object instanceValue) {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public URL createURLFromString(EDataType eDataType, String initialValue) {
-        return (URL)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertURLToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Definition createDefinitionFromString(EDataType eDataType, String initialValue) {
-        return (Definition)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertDefinitionToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<?, ?> createMapFromString(EDataType eDataType, String initialValue) {
-        return (Map<?, ?>)super.createFromString(initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertMapToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public IMethod createIMethodFromString(EDataType eDataType, String initialValue) {
-        return (IMethod)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertIMethodToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFPackage getCXFPackage() {
-        return (CXFPackage)getEPackage();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
-    @Deprecated
-    public static CXFPackage getPackage() {
-        return CXFPackage.eINSTANCE;
-    }
-
-} //CXFFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
deleted file mode 100644
index c566bd1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
+++ /dev/null
@@ -1,1177 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFPackageImpl.java,v 1.5 2009/08/23 22:51:57 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFPackageImpl extends EPackageImpl implements CXFPackage {
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass cxfContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass cxfDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass java2WSContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass java2WSDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdl2JavaContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdl2JavaDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EEnum frontendEEnum = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EEnum dataBindingEEnum = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType urlEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType definitionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType mapEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType iMethodEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private CXFPackageImpl() {
-        super(eNS_URI, CXFFactory.eINSTANCE);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this
-     * model, and for any others upon which it depends.  Simple
-     * dependencies are satisfied by calling this method on all
-     * dependent packages before doing anything else.  This method drives
-     * initialization for interdependent packages directly, in parallel
-     * with this package, itself.
-     * <p>Of this package and its interdependencies, all packages which
-     * have not yet been registered by their URI values are first created
-     * and registered.  The packages are then initialized in two steps:
-     * meta-model objects for all of the packages are created before any
-     * are initialized, since one package's meta-model objects may refer to
-     * those of another.
-     * <p>Invocation of this method will not affect any packages that have
-     * already been initialized.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static CXFPackage init() {
-        if (isInited) return (CXFPackage)EPackage.Registry.INSTANCE.getEPackage(CXFPackage.eNS_URI);
-
-        // Obtain or create and register package
-        CXFPackageImpl theCXFPackage = (CXFPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CXFPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CXFPackageImpl());
-
-        isInited = true;
-
-        // Create package meta-data objects
-        theCXFPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theCXFPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theCXFPackage.freeze();
-
-        return theCXFPackage;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getCXFContext() {
-        return cxfContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeLocation() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeEdition() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeVersion() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Verbose() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateAntBuildFile() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateClient() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateServer() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Databinding() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Frontend() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_UseSpringApplicationContext() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_ExportCXFClasspathContainer() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getCXFDataModel() {
-        return cxfDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ProjectName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ResourceDirectory() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ClassDirectory() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlFileName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlURL() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ConfigWsdlLocation() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_FullyQualifiedJavaClassName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ConfigId() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_TargetNamespace() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_EndpointName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ServiceName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(11);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlDefinition() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(12);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlLocation() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(13);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getJava2WSContext() {
-        return java2WSContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_Soap12Binding() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateXSDImports() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWSDL() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWrapperFaultBeans() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_AnnotationProcessingEnabled() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWebMethodAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWebParamAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getJava2WSDataModel() {
-        return java2WSDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_Classpath() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_JavaStartingPoint() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_UseServiceEndpointInterface() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_ExtractInterface() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_MethodMap() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_AnnotationMap() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_SourceDirectory() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_PortName() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDL2JavaContext() {
-        return wsdl2JavaContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_GenerateImplementation() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_ProcessSOAPHeaders() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_Validate() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_WsdlVersion() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_UseDefaultValues() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcArgs() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_NoAddressBinding() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcUseDefaultValues() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToString() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToStringMultiLine() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(11);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToStringSimple() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(12);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcLocator() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(13);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcSyncMethods() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(14);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcMarkGenerated() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(15);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcEpisodeFile() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(16);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_AutoNameResolution() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(17);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDL2JavaDataModel() {
-        return wsdl2JavaDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_IncludedNamespaces() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_BindingFiles() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_ExcludedNamespaces() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_CatalogFile() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_JavaSourceFolder() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EEnum getFrontend() {
-        return frontendEEnum;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EEnum getDataBinding() {
-        return dataBindingEEnum;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getURL() {
-        return urlEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDefinition() {
-        return definitionEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getMap() {
-        return mapEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getIMethod() {
-        return iMethodEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFFactory getCXFFactory() {
-        return (CXFFactory)getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents() {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create classes and their features
-        cxfContextEClass = createEClass(CXF_CONTEXT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_LOCATION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_EDITION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_VERSION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__VERBOSE);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_ANT_BUILD_FILE);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_CLIENT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_SERVER);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__DATABINDING);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__FRONTEND);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER);
-
-        cxfDataModelEClass = createEClass(CXF_DATA_MODEL);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__PROJECT_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__RESOURCE_DIRECTORY);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CLASS_DIRECTORY);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_FILE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_URL);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_WSDL_LOCATION);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_ID);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__TARGET_NAMESPACE);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__ENDPOINT_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__SERVICE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_DEFINITION);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_LOCATION);
-
-        java2WSContextEClass = createEClass(JAVA2_WS_CONTEXT);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__SOAP12_BINDING);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WSDL);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION);
-
-        java2WSDataModelEClass = createEClass(JAVA2_WS_DATA_MODEL);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__CLASSPATH);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__METHOD_MAP);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__ANNOTATION_MAP);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__PORT_NAME);
-
-        wsdl2JavaContextEClass = createEClass(WSDL2_JAVA_CONTEXT);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__VALIDATE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__WSDL_VERSION);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_ARGS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_LOCATOR);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION);
-
-        wsdl2JavaDataModelEClass = createEClass(WSDL2_JAVA_DATA_MODEL);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__CATALOG_FILE);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER);
-
-        // Create enums
-        frontendEEnum = createEEnum(FRONTEND);
-        dataBindingEEnum = createEEnum(DATA_BINDING);
-
-        // Create data types
-        urlEDataType = createEDataType(URL);
-        definitionEDataType = createEDataType(DEFINITION);
-        mapEDataType = createEDataType(MAP);
-        iMethodEDataType = createEDataType(IMETHOD);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents() {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Create type parameters
-        addETypeParameter(mapEDataType, "T");
-        addETypeParameter(mapEDataType, "T1");
-
-        // Set bounds for type parameters
-
-        // Add supertypes to classes
-        cxfDataModelEClass.getESuperTypes().add(this.getCXFContext());
-        java2WSContextEClass.getESuperTypes().add(this.getCXFContext());
-        java2WSDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
-        java2WSDataModelEClass.getESuperTypes().add(this.getJava2WSContext());
-        wsdl2JavaContextEClass.getESuperTypes().add(this.getCXFContext());
-        wsdl2JavaDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
-        wsdl2JavaDataModelEClass.getESuperTypes().add(this.getWSDL2JavaContext());
-
-        // Initialize classes and features; add operations and parameters
-        initEClass(cxfContextEClass, CXFContext.class, "CXFContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCXFContext_CxfRuntimeLocation(), ecorePackage.getEString(), "cxfRuntimeLocation", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_CxfRuntimeEdition(), ecorePackage.getEString(), "cxfRuntimeEdition", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_CxfRuntimeVersion(), ecorePackage.getEString(), "cxfRuntimeVersion", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Verbose(), ecorePackage.getEBoolean(), "verbose", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateAntBuildFile(), ecorePackage.getEBoolean(), "generateAntBuildFile", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateClient(), ecorePackage.getEBoolean(), "generateClient", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateServer(), ecorePackage.getEBoolean(), "generateServer", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Databinding(), this.getDataBinding(), "databinding", "jaxb", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Frontend(), this.getFrontend(), "frontend", "jaxws", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_UseSpringApplicationContext(), ecorePackage.getEBoolean(), "useSpringApplicationContext", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_ExportCXFClasspathContainer(), ecorePackage.getEBoolean(), "exportCXFClasspathContainer", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(cxfDataModelEClass, CXFDataModel.class, "CXFDataModel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCXFDataModel_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ResourceDirectory(), ecorePackage.getEString(), "resourceDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ClassDirectory(), ecorePackage.getEString(), "classDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlFileName(), ecorePackage.getEString(), "wsdlFileName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlURL(), this.getURL(), "wsdlURL", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ConfigWsdlLocation(), ecorePackage.getEString(), "configWsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_FullyQualifiedJavaClassName(), ecorePackage.getEString(), "fullyQualifiedJavaClassName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_FullyQualifiedJavaInterfaceName(), ecorePackage.getEString(), "fullyQualifiedJavaInterfaceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ConfigId(), ecorePackage.getEString(), "configId", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_EndpointName(), ecorePackage.getEString(), "endpointName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ServiceName(), ecorePackage.getEString(), "serviceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlDefinition(), this.getDefinition(), "wsdlDefinition", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlLocation(), ecorePackage.getEString(), "wsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(java2WSContextEClass, Java2WSContext.class, "Java2WSContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getJava2WSContext_Soap12Binding(), ecorePackage.getEBoolean(), "soap12Binding", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateXSDImports(), ecorePackage.getEBoolean(), "generateXSDImports", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWSDL(), ecorePackage.getEBoolean(), "generateWSDL", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWrapperFaultBeans(), ecorePackage.getEBoolean(), "generateWrapperFaultBeans", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_AnnotationProcessingEnabled(), ecorePackage.getEBoolean(), "annotationProcessingEnabled", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWebMethodAnnotation(), ecorePackage.getEBoolean(), "generateWebMethodAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWebParamAnnotation(), ecorePackage.getEBoolean(), "generateWebParamAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateRequestWrapperAnnotation(), ecorePackage.getEBoolean(), "generateRequestWrapperAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateResponseWrapperAnnotation(), ecorePackage.getEBoolean(), "generateResponseWrapperAnnotation", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(java2WSDataModelEClass, Java2WSDataModel.class, "Java2WSDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getJava2WSDataModel_Classpath(), ecorePackage.getEString(), "classpath", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_JavaStartingPoint(), ecorePackage.getEString(), "javaStartingPoint", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_UseServiceEndpointInterface(), ecorePackage.getEBoolean(), "useServiceEndpointInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_ExtractInterface(), ecorePackage.getEBoolean(), "extractInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_ServiceEndpointInterfaceName(), ecorePackage.getEString(), "serviceEndpointInterfaceName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        EGenericType g1 = createEGenericType(this.getMap());
-        EGenericType g2 = createEGenericType(this.getIMethod());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(this.getMap());
-        g1.getETypeArguments().add(g2);
-        EGenericType g3 = createEGenericType(ecorePackage.getEString());
-        g2.getETypeArguments().add(g3);
-        g3 = createEGenericType(ecorePackage.getEBooleanObject());
-        g2.getETypeArguments().add(g3);
-        initEAttribute(getJava2WSDataModel_MethodMap(), g1, "methodMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEBooleanObject());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getJava2WSDataModel_AnnotationMap(), g1, "annotationMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_SourceDirectory(), ecorePackage.getEString(), "sourceDirectory", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(wsdl2JavaContextEClass, WSDL2JavaContext.class, "WSDL2JavaContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWSDL2JavaContext_GenerateImplementation(), ecorePackage.getEBoolean(), "generateImplementation", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_ProcessSOAPHeaders(), ecorePackage.getEBoolean(), "processSOAPHeaders", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping(), ecorePackage.getEBoolean(), "loadDefaultNamespacePackageNameMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping(), ecorePackage.getEBoolean(), "loadDefaultExcludesNamepsaceMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_Validate(), ecorePackage.getEBoolean(), "validate", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_WsdlVersion(), ecorePackage.getEString(), "wsdlVersion", "1.1", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_UseDefaultValues(), ecorePackage.getEBoolean(), "useDefaultValues", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcArgs(), ecorePackage.getEString(), "xjcArgs", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_NoAddressBinding(), ecorePackage.getEBoolean(), "noAddressBinding", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcUseDefaultValues(), ecorePackage.getEBoolean(), "xjcUseDefaultValues", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToString(), ecorePackage.getEBoolean(), "xjcToString", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToStringMultiLine(), ecorePackage.getEBoolean(), "xjcToStringMultiLine", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToStringSimple(), ecorePackage.getEBoolean(), "xjcToStringSimple", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcLocator(), ecorePackage.getEBoolean(), "xjcLocator", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcSyncMethods(), ecorePackage.getEBoolean(), "xjcSyncMethods", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcMarkGenerated(), ecorePackage.getEBoolean(), "xjcMarkGenerated", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcEpisodeFile(), ecorePackage.getEString(), "xjcEpisodeFile", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_AutoNameResolution(), ecorePackage.getEBoolean(), "autoNameResolution", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(wsdl2JavaDataModelEClass, WSDL2JavaDataModel.class, "WSDL2JavaDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getWSDL2JavaDataModel_IncludedNamespaces(), g1, "includedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_BindingFiles(), ecorePackage.getEString(), "bindingFiles", null, 0, -1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getWSDL2JavaDataModel_ExcludedNamespaces(), g1, "excludedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_CatalogFile(), ecorePackage.getEString(), "catalogFile", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_JavaSourceFolder(), ecorePackage.getEString(), "javaSourceFolder", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        // Initialize enums and add enum literals
-        initEEnum(frontendEEnum, Frontend.class, "Frontend");
-        addEEnumLiteral(frontendEEnum, Frontend.JAXWS);
-
-        initEEnum(dataBindingEEnum, DataBinding.class, "DataBinding");
-        addEEnumLiteral(dataBindingEEnum, DataBinding.JAXB);
-
-        // Initialize data types
-        initEDataType(urlEDataType, java.net.URL.class, "URL", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(definitionEDataType, Definition.class, "Definition", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(mapEDataType, Map.class, "Map", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(iMethodEDataType, IMethod.class, "IMethod", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-} //CXFPackageImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
deleted file mode 100644
index 399f07c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
+++ /dev/null
@@ -1,1124 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: Java2WSDataModelImpl.java,v 1.2 2009/08/23 22:51:57 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java2 WS Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isSoap12Binding <em>Soap12 Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateXSDImports <em>Generate XSD Imports</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWSDL <em>Generate WSDL</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getClasspath <em>Classpath</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getJavaStartingPoint <em>Java Starting Point</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isExtractInterface <em>Extract Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getMethodMap <em>Method Map</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getAnnotationMap <em>Annotation Map</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getSourceDirectory <em>Source Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Java2WSDataModelImpl extends CXFDataModelImpl implements Java2WSDataModel {
-    /**
-     * The default value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSoap12Binding()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean SOAP12_BINDING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSoap12Binding()
-     * @generated
-     * @ordered
-     */
-    protected boolean soap12Binding = SOAP12_BINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateXSDImports()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_XSD_IMPORTS_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateXSDImports()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateXSDImports = GENERATE_XSD_IMPORTS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWSDL()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WSDL_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWSDL()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWSDL = GENERATE_WSDL_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWrapperFaultBeans = GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean ANNOTATION_PROCESSING_ENABLED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     * @ordered
-     */
-    protected boolean annotationProcessingEnabled = ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWebMethodAnnotation = GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWebParamAnnotation = GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateRequestWrapperAnnotation = GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateResponseWrapperAnnotation = GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClasspath()
-     * @generated
-     * @ordered
-     */
-    protected static final String CLASSPATH_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClasspath()
-     * @generated
-     * @ordered
-     */
-    protected String classpath = CLASSPATH_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaStartingPoint()
-     * @generated
-     * @ordered
-     */
-    protected static final String JAVA_STARTING_POINT_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaStartingPoint()
-     * @generated
-     * @ordered
-     */
-    protected String javaStartingPoint = JAVA_STARTING_POINT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     * @ordered
-     */
-    protected boolean useServiceEndpointInterface = USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExtractInterface()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean EXTRACT_INTERFACE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExtractInterface()
-     * @generated
-     * @ordered
-     */
-    protected boolean extractInterface = EXTRACT_INTERFACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected String serviceEndpointInterfaceName = SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getMethodMap() <em>Method Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMethodMap()
-     * @generated
-     * @ordered
-     */
-    protected Map<IMethod, Map<String, Boolean>> methodMap;
-
-    /**
-     * The cached value of the '{@link #getAnnotationMap() <em>Annotation Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getAnnotationMap()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, Boolean> annotationMap;
-
-    /**
-     * The default value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String SOURCE_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String sourceDirectory = SOURCE_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPortName()
-     * @generated
-     * @ordered
-     */
-    protected static final String PORT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPortName()
-     * @generated
-     * @ordered
-     */
-    protected String portName = PORT_NAME_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected Java2WSDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.JAVA2_WS_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isSoap12Binding() {
-        return soap12Binding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSoap12Binding(boolean newSoap12Binding) {
-        boolean oldSoap12Binding = soap12Binding;
-        soap12Binding = newSoap12Binding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING, oldSoap12Binding, soap12Binding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateXSDImports() {
-        return generateXSDImports;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateXSDImports(boolean newGenerateXSDImports) {
-        boolean oldGenerateXSDImports = generateXSDImports;
-        generateXSDImports = newGenerateXSDImports;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS, oldGenerateXSDImports, generateXSDImports));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWSDL() {
-        return generateWSDL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWSDL(boolean newGenerateWSDL) {
-        boolean oldGenerateWSDL = generateWSDL;
-        generateWSDL = newGenerateWSDL;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL, oldGenerateWSDL, generateWSDL));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWrapperFaultBeans() {
-        return generateWrapperFaultBeans;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWrapperFaultBeans(boolean newGenerateWrapperFaultBeans) {
-        boolean oldGenerateWrapperFaultBeans = generateWrapperFaultBeans;
-        generateWrapperFaultBeans = newGenerateWrapperFaultBeans;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS, oldGenerateWrapperFaultBeans, generateWrapperFaultBeans));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isAnnotationProcessingEnabled() {
-        return annotationProcessingEnabled;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAnnotationProcessingEnabled(boolean newAnnotationProcessingEnabled) {
-        boolean oldAnnotationProcessingEnabled = annotationProcessingEnabled;
-        annotationProcessingEnabled = newAnnotationProcessingEnabled;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED, oldAnnotationProcessingEnabled, annotationProcessingEnabled));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWebMethodAnnotation() {
-        return generateWebMethodAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWebMethodAnnotation(boolean newGenerateWebMethodAnnotation) {
-        boolean oldGenerateWebMethodAnnotation = generateWebMethodAnnotation;
-        generateWebMethodAnnotation = newGenerateWebMethodAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION, oldGenerateWebMethodAnnotation, generateWebMethodAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWebParamAnnotation() {
-        return generateWebParamAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWebParamAnnotation(boolean newGenerateWebParamAnnotation) {
-        boolean oldGenerateWebParamAnnotation = generateWebParamAnnotation;
-        generateWebParamAnnotation = newGenerateWebParamAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION, oldGenerateWebParamAnnotation, generateWebParamAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateRequestWrapperAnnotation() {
-        return generateRequestWrapperAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateRequestWrapperAnnotation(boolean newGenerateRequestWrapperAnnotation) {
-        boolean oldGenerateRequestWrapperAnnotation = generateRequestWrapperAnnotation;
-        generateRequestWrapperAnnotation = newGenerateRequestWrapperAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION, oldGenerateRequestWrapperAnnotation, generateRequestWrapperAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateResponseWrapperAnnotation() {
-        return generateResponseWrapperAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateResponseWrapperAnnotation(boolean newGenerateResponseWrapperAnnotation) {
-        boolean oldGenerateResponseWrapperAnnotation = generateResponseWrapperAnnotation;
-        generateResponseWrapperAnnotation = newGenerateResponseWrapperAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION, oldGenerateResponseWrapperAnnotation, generateResponseWrapperAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getClasspath() {
-        return classpath;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setClasspath(String newClasspath) {
-        String oldClasspath = classpath;
-        classpath = newClasspath;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH, oldClasspath, classpath));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getJavaStartingPoint() {
-        return javaStartingPoint;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setJavaStartingPoint(String newJavaStartingPoint) {
-        String oldJavaStartingPoint = javaStartingPoint;
-        javaStartingPoint = newJavaStartingPoint;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT, oldJavaStartingPoint, javaStartingPoint));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseServiceEndpointInterface() {
-        return useServiceEndpointInterface;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseServiceEndpointInterface(boolean newUseServiceEndpointInterface) {
-        boolean oldUseServiceEndpointInterface = useServiceEndpointInterface;
-        useServiceEndpointInterface = newUseServiceEndpointInterface;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE, oldUseServiceEndpointInterface, useServiceEndpointInterface));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isExtractInterface() {
-        return extractInterface;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExtractInterface(boolean newExtractInterface) {
-        boolean oldExtractInterface = extractInterface;
-        extractInterface = newExtractInterface;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE, oldExtractInterface, extractInterface));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getServiceEndpointInterfaceName() {
-        return serviceEndpointInterfaceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setServiceEndpointInterfaceName(String newServiceEndpointInterfaceName) {
-        String oldServiceEndpointInterfaceName = serviceEndpointInterfaceName;
-        serviceEndpointInterfaceName = newServiceEndpointInterfaceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME, oldServiceEndpointInterfaceName, serviceEndpointInterfaceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<IMethod, Map<String, Boolean>> getMethodMap() {
-        return methodMap;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setMethodMap(Map<IMethod, Map<String, Boolean>> newMethodMap) {
-        Map<IMethod, Map<String, Boolean>> oldMethodMap = methodMap;
-        methodMap = newMethodMap;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP, oldMethodMap, methodMap));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, Boolean> getAnnotationMap() {
-        return annotationMap;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAnnotationMap(Map<String, Boolean> newAnnotationMap) {
-        Map<String, Boolean> oldAnnotationMap = annotationMap;
-        annotationMap = newAnnotationMap;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP, oldAnnotationMap, annotationMap));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getSourceDirectory() {
-        return sourceDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSourceDirectory(String newSourceDirectory) {
-        String oldSourceDirectory = sourceDirectory;
-        sourceDirectory = newSourceDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY, oldSourceDirectory, sourceDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getPortName() {
-        return portName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setPortName(String newPortName) {
-        String oldPortName = portName;
-        portName = newPortName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME, oldPortName, portName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                return isSoap12Binding() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                return isGenerateXSDImports() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                return isGenerateWSDL() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                return isGenerateWrapperFaultBeans() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                return isAnnotationProcessingEnabled() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                return isGenerateWebMethodAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                return isGenerateWebParamAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                return isGenerateRequestWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                return isGenerateResponseWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                return getClasspath();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                return getJavaStartingPoint();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                return isUseServiceEndpointInterface() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                return isExtractInterface() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                return getServiceEndpointInterfaceName();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                return getMethodMap();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                return getAnnotationMap();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                return getSourceDirectory();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                return getPortName();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                setSoap12Binding(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                setGenerateXSDImports(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                setGenerateWSDL(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                setGenerateWrapperFaultBeans(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                setAnnotationProcessingEnabled(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                setGenerateWebMethodAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                setGenerateWebParamAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                setGenerateRequestWrapperAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                setGenerateResponseWrapperAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                setClasspath((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                setJavaStartingPoint((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                setUseServiceEndpointInterface(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                setExtractInterface(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                setServiceEndpointInterfaceName((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                setMethodMap((Map<IMethod, Map<String, Boolean>>)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                setAnnotationMap((Map<String, Boolean>)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                setSourceDirectory((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                setPortName((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                setSoap12Binding(SOAP12_BINDING_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                setGenerateXSDImports(GENERATE_XSD_IMPORTS_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                setGenerateWSDL(GENERATE_WSDL_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                setGenerateWrapperFaultBeans(GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                setAnnotationProcessingEnabled(ANNOTATION_PROCESSING_ENABLED_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                setGenerateWebMethodAnnotation(GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                setGenerateWebParamAnnotation(GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                setGenerateRequestWrapperAnnotation(GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                setGenerateResponseWrapperAnnotation(GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                setClasspath(CLASSPATH_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                setJavaStartingPoint(JAVA_STARTING_POINT_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                setUseServiceEndpointInterface(USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                setExtractInterface(EXTRACT_INTERFACE_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                setServiceEndpointInterfaceName(SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                setMethodMap((Map<IMethod, Map<String, Boolean>>)null);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                setAnnotationMap((Map<String, Boolean>)null);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                setSourceDirectory(SOURCE_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                setPortName(PORT_NAME_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                return soap12Binding != SOAP12_BINDING_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                return generateXSDImports != GENERATE_XSD_IMPORTS_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                return generateWSDL != GENERATE_WSDL_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                return generateWrapperFaultBeans != GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                return annotationProcessingEnabled != ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                return generateWebMethodAnnotation != GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                return generateWebParamAnnotation != GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                return generateRequestWrapperAnnotation != GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                return generateResponseWrapperAnnotation != GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                return CLASSPATH_EDEFAULT == null ? classpath != null : !CLASSPATH_EDEFAULT.equals(classpath);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                return JAVA_STARTING_POINT_EDEFAULT == null ? javaStartingPoint != null : !JAVA_STARTING_POINT_EDEFAULT.equals(javaStartingPoint);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                return useServiceEndpointInterface != USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                return extractInterface != EXTRACT_INTERFACE_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                return SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT == null ? serviceEndpointInterfaceName != null : !SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT.equals(serviceEndpointInterfaceName);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                return methodMap != null;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                return annotationMap != null;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                return SOURCE_DIRECTORY_EDEFAULT == null ? sourceDirectory != null : !SOURCE_DIRECTORY_EDEFAULT.equals(sourceDirectory);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == Java2WSContext.class) {
-            switch (derivedFeatureID) {
-                case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING: return CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
-                default: return -1;
-            }
-        }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == Java2WSContext.class) {
-            switch (baseFeatureID) {
-                case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING: return CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS;
-                case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
-                default: return -1;
-            }
-        }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (soap12Binding: ");
-        result.append(soap12Binding);
-        result.append(", generateXSDImports: ");
-        result.append(generateXSDImports);
-        result.append(", generateWSDL: ");
-        result.append(generateWSDL);
-        result.append(", generateWrapperFaultBeans: ");
-        result.append(generateWrapperFaultBeans);
-        result.append(", annotationProcessingEnabled: ");
-        result.append(annotationProcessingEnabled);
-        result.append(", generateWebMethodAnnotation: ");
-        result.append(generateWebMethodAnnotation);
-        result.append(", generateWebParamAnnotation: ");
-        result.append(generateWebParamAnnotation);
-        result.append(", generateRequestWrapperAnnotation: ");
-        result.append(generateRequestWrapperAnnotation);
-        result.append(", generateResponseWrapperAnnotation: ");
-        result.append(generateResponseWrapperAnnotation);
-        result.append(", classpath: ");
-        result.append(classpath);
-        result.append(", javaStartingPoint: ");
-        result.append(javaStartingPoint);
-        result.append(", useServiceEndpointInterface: ");
-        result.append(useServiceEndpointInterface);
-        result.append(", extractInterface: ");
-        result.append(extractInterface);
-        result.append(", serviceEndpointInterfaceName: ");
-        result.append(serviceEndpointInterfaceName);
-        result.append(", methodMap: ");
-        result.append(methodMap);
-        result.append(", annotationMap: ");
-        result.append(annotationMap);
-        result.append(", sourceDirectory: ");
-        result.append(sourceDirectory);
-        result.append(", portName: ");
-        result.append(portName);
-        result.append(')');
-        return result.toString();
-    }
-
-} //Java2WSDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
deleted file mode 100644
index 93a7053..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
+++ /dev/null
@@ -1,1397 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: WSDL2JavaDataModelImpl.java,v 1.2 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL2 Java Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isGenerateImplementation <em>Generate Implementation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isProcessSOAPHeaders <em>Process SOAP Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isValidate <em>Validate</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getWsdlVersion <em>Wsdl Version</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isUseDefaultValues <em>Use Default Values</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcArgs <em>Xjc Args</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isNoAddressBinding <em>No Address Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToString <em>Xjc To String</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringSimple <em>Xjc To String Simple</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcLocator <em>Xjc Locator</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcSyncMethods <em>Xjc Sync Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcMarkGenerated <em>Xjc Mark Generated</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcEpisodeFile <em>Xjc Episode File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isAutoNameResolution <em>Auto Name Resolution</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getIncludedNamespaces <em>Included Namespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getBindingFiles <em>Binding Files</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getExcludedNamespaces <em>Excluded Namespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getCatalogFile <em>Catalog File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getJavaSourceFolder <em>Java Source Folder</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDL2JavaDataModelImpl extends CXFDataModelImpl implements WSDL2JavaDataModel {
-    /**
-     * The default value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateImplementation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_IMPLEMENTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateImplementation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateImplementation = GENERATE_IMPLEMENTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean PROCESS_SOAP_HEADERS_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     * @ordered
-     */
-    protected boolean processSOAPHeaders = PROCESS_SOAP_HEADERS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     * @ordered
-     */
-    protected boolean loadDefaultNamespacePackageNameMapping = LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     * @ordered
-     */
-    protected boolean loadDefaultExcludesNamepsaceMapping = LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isValidate() <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isValidate()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean VALIDATE_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isValidate() <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isValidate()
-     * @generated
-     * @ordered
-     */
-    protected boolean validate = VALIDATE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_VERSION_EDEFAULT = "1.1";
-
-    /**
-     * The cached value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlVersion()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlVersion = WSDL_VERSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_DEFAULT_VALUES_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected boolean useDefaultValues = USE_DEFAULT_VALUES_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcArgs()
-     * @generated
-     * @ordered
-     */
-    protected static final String XJC_ARGS_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcArgs()
-     * @generated
-     * @ordered
-     */
-    protected String xjcArgs = XJC_ARGS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isNoAddressBinding()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean NO_ADDRESS_BINDING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isNoAddressBinding()
-     * @generated
-     * @ordered
-     */
-    protected boolean noAddressBinding = NO_ADDRESS_BINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_USE_DEFAULT_VALUES_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcUseDefaultValues = XJC_USE_DEFAULT_VALUES_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToString()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToString()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToString = XJC_TO_STRING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_MULTI_LINE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToStringMultiLine = XJC_TO_STRING_MULTI_LINE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringSimple()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_SIMPLE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringSimple()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToStringSimple = XJC_TO_STRING_SIMPLE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcLocator()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_LOCATOR_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcLocator()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcLocator = XJC_LOCATOR_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcSyncMethods()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_SYNC_METHODS_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcSyncMethods()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcSyncMethods = XJC_SYNC_METHODS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcMarkGenerated()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_MARK_GENERATED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcMarkGenerated()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcMarkGenerated = XJC_MARK_GENERATED_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcEpisodeFile()
-     * @generated
-     * @ordered
-     */
-    protected static final String XJC_EPISODE_FILE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcEpisodeFile()
-     * @generated
-     * @ordered
-     */
-    protected String xjcEpisodeFile = XJC_EPISODE_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAutoNameResolution()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean AUTO_NAME_RESOLUTION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAutoNameResolution()
-     * @generated
-     * @ordered
-     */
-    protected boolean autoNameResolution = AUTO_NAME_RESOLUTION_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getIncludedNamespaces() <em>Included Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getIncludedNamespaces()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, String> includedNamespaces;
-
-    /**
-     * The cached value of the '{@link #getBindingFiles() <em>Binding Files</em>}' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getBindingFiles()
-     * @generated
-     * @ordered
-     */
-    protected EList<String> bindingFiles;
-
-    /**
-     * The cached value of the '{@link #getExcludedNamespaces() <em>Excluded Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getExcludedNamespaces()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, String> excludedNamespaces;
-
-    /**
-     * The default value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCatalogFile()
-     * @generated
-     * @ordered
-     */
-    protected static final String CATALOG_FILE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCatalogFile()
-     * @generated
-     * @ordered
-     */
-    protected String catalogFile = CATALOG_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaSourceFolder()
-     * @generated
-     * @ordered
-     */
-    protected static final String JAVA_SOURCE_FOLDER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaSourceFolder()
-     * @generated
-     * @ordered
-     */
-    protected String javaSourceFolder = JAVA_SOURCE_FOLDER_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected WSDL2JavaDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.WSDL2_JAVA_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateImplementation() {
-        return generateImplementation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateImplementation(boolean newGenerateImplementation) {
-        boolean oldGenerateImplementation = generateImplementation;
-        generateImplementation = newGenerateImplementation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION, oldGenerateImplementation, generateImplementation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isProcessSOAPHeaders() {
-        return processSOAPHeaders;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setProcessSOAPHeaders(boolean newProcessSOAPHeaders) {
-        boolean oldProcessSOAPHeaders = processSOAPHeaders;
-        processSOAPHeaders = newProcessSOAPHeaders;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS, oldProcessSOAPHeaders, processSOAPHeaders));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isLoadDefaultNamespacePackageNameMapping() {
-        return loadDefaultNamespacePackageNameMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setLoadDefaultNamespacePackageNameMapping(boolean newLoadDefaultNamespacePackageNameMapping) {
-        boolean oldLoadDefaultNamespacePackageNameMapping = loadDefaultNamespacePackageNameMapping;
-        loadDefaultNamespacePackageNameMapping = newLoadDefaultNamespacePackageNameMapping;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING, oldLoadDefaultNamespacePackageNameMapping, loadDefaultNamespacePackageNameMapping));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isLoadDefaultExcludesNamepsaceMapping() {
-        return loadDefaultExcludesNamepsaceMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setLoadDefaultExcludesNamepsaceMapping(boolean newLoadDefaultExcludesNamepsaceMapping) {
-        boolean oldLoadDefaultExcludesNamepsaceMapping = loadDefaultExcludesNamepsaceMapping;
-        loadDefaultExcludesNamepsaceMapping = newLoadDefaultExcludesNamepsaceMapping;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING, oldLoadDefaultExcludesNamepsaceMapping, loadDefaultExcludesNamepsaceMapping));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isValidate() {
-        return validate;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setValidate(boolean newValidate) {
-        boolean oldValidate = validate;
-        validate = newValidate;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE, oldValidate, validate));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlVersion() {
-        return wsdlVersion;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlVersion(String newWsdlVersion) {
-        String oldWsdlVersion = wsdlVersion;
-        wsdlVersion = newWsdlVersion;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION, oldWsdlVersion, wsdlVersion));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseDefaultValues() {
-        return useDefaultValues;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseDefaultValues(boolean newUseDefaultValues) {
-        boolean oldUseDefaultValues = useDefaultValues;
-        useDefaultValues = newUseDefaultValues;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES, oldUseDefaultValues, useDefaultValues));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getXjcArgs() {
-        return xjcArgs;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcArgs(String newXjcArgs) {
-        String oldXjcArgs = xjcArgs;
-        xjcArgs = newXjcArgs;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS, oldXjcArgs, xjcArgs));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isNoAddressBinding() {
-        return noAddressBinding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setNoAddressBinding(boolean newNoAddressBinding) {
-        boolean oldNoAddressBinding = noAddressBinding;
-        noAddressBinding = newNoAddressBinding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING, oldNoAddressBinding, noAddressBinding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcUseDefaultValues() {
-        return xjcUseDefaultValues;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcUseDefaultValues(boolean newXjcUseDefaultValues) {
-        boolean oldXjcUseDefaultValues = xjcUseDefaultValues;
-        xjcUseDefaultValues = newXjcUseDefaultValues;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES, oldXjcUseDefaultValues, xjcUseDefaultValues));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToString() {
-        return xjcToString;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToString(boolean newXjcToString) {
-        boolean oldXjcToString = xjcToString;
-        xjcToString = newXjcToString;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING, oldXjcToString, xjcToString));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToStringMultiLine() {
-        return xjcToStringMultiLine;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToStringMultiLine(boolean newXjcToStringMultiLine) {
-        boolean oldXjcToStringMultiLine = xjcToStringMultiLine;
-        xjcToStringMultiLine = newXjcToStringMultiLine;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE, oldXjcToStringMultiLine, xjcToStringMultiLine));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToStringSimple() {
-        return xjcToStringSimple;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToStringSimple(boolean newXjcToStringSimple) {
-        boolean oldXjcToStringSimple = xjcToStringSimple;
-        xjcToStringSimple = newXjcToStringSimple;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE, oldXjcToStringSimple, xjcToStringSimple));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcLocator() {
-        return xjcLocator;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcLocator(boolean newXjcLocator) {
-        boolean oldXjcLocator = xjcLocator;
-        xjcLocator = newXjcLocator;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR, oldXjcLocator, xjcLocator));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcSyncMethods() {
-        return xjcSyncMethods;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcSyncMethods(boolean newXjcSyncMethods) {
-        boolean oldXjcSyncMethods = xjcSyncMethods;
-        xjcSyncMethods = newXjcSyncMethods;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS, oldXjcSyncMethods, xjcSyncMethods));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcMarkGenerated() {
-        return xjcMarkGenerated;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcMarkGenerated(boolean newXjcMarkGenerated) {
-        boolean oldXjcMarkGenerated = xjcMarkGenerated;
-        xjcMarkGenerated = newXjcMarkGenerated;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED, oldXjcMarkGenerated, xjcMarkGenerated));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getXjcEpisodeFile() {
-        return xjcEpisodeFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcEpisodeFile(String newXjcEpisodeFile) {
-        String oldXjcEpisodeFile = xjcEpisodeFile;
-        xjcEpisodeFile = newXjcEpisodeFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE, oldXjcEpisodeFile, xjcEpisodeFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isAutoNameResolution() {
-        return autoNameResolution;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAutoNameResolution(boolean newAutoNameResolution) {
-        boolean oldAutoNameResolution = autoNameResolution;
-        autoNameResolution = newAutoNameResolution;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION, oldAutoNameResolution, autoNameResolution));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, String> getIncludedNamespaces() {
-        return includedNamespaces;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setIncludedNamespaces(Map<String, String> newIncludedNamespaces) {
-        Map<String, String> oldIncludedNamespaces = includedNamespaces;
-        includedNamespaces = newIncludedNamespaces;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES, oldIncludedNamespaces, includedNamespaces));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EList<String> getBindingFiles() {
-        if (bindingFiles == null) {
-            bindingFiles = new EDataTypeUniqueEList<String>(String.class, this, CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
-        }
-        return bindingFiles;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, String> getExcludedNamespaces() {
-        return excludedNamespaces;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExcludedNamespaces(Map<String, String> newExcludedNamespaces) {
-        Map<String, String> oldExcludedNamespaces = excludedNamespaces;
-        excludedNamespaces = newExcludedNamespaces;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES, oldExcludedNamespaces, excludedNamespaces));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCatalogFile() {
-        return catalogFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCatalogFile(String newCatalogFile) {
-        String oldCatalogFile = catalogFile;
-        catalogFile = newCatalogFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE, oldCatalogFile, catalogFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getJavaSourceFolder() {
-        return javaSourceFolder;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setJavaSourceFolder(String newJavaSourceFolder) {
-        String oldJavaSourceFolder = javaSourceFolder;
-        javaSourceFolder = newJavaSourceFolder;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER, oldJavaSourceFolder, javaSourceFolder));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                return isGenerateImplementation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                return isProcessSOAPHeaders() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                return isLoadDefaultNamespacePackageNameMapping() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                return isLoadDefaultExcludesNamepsaceMapping() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                return isValidate() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                return getWsdlVersion();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                return isUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                return getXjcArgs();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                return isNoAddressBinding() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                return isXjcUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                return isXjcToString() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                return isXjcToStringMultiLine() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                return isXjcToStringSimple() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                return isXjcLocator() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                return isXjcSyncMethods() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                return isXjcMarkGenerated() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                return getXjcEpisodeFile();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                return isAutoNameResolution() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                return getIncludedNamespaces();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                return getBindingFiles();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                return getExcludedNamespaces();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                return getCatalogFile();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                return getJavaSourceFolder();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                setGenerateImplementation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                setProcessSOAPHeaders(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                setLoadDefaultNamespacePackageNameMapping(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                setLoadDefaultExcludesNamepsaceMapping(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                setValidate(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                setWsdlVersion((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                setUseDefaultValues(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                setXjcArgs((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                setNoAddressBinding(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                setXjcUseDefaultValues(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                setXjcToString(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                setXjcToStringMultiLine(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                setXjcToStringSimple(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                setXjcLocator(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                setXjcSyncMethods(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                setXjcMarkGenerated(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                setXjcEpisodeFile((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                setAutoNameResolution(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                setIncludedNamespaces((Map<String, String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                getBindingFiles().clear();
-                getBindingFiles().addAll((Collection<? extends String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                setExcludedNamespaces((Map<String, String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                setCatalogFile((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                setJavaSourceFolder((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                setGenerateImplementation(GENERATE_IMPLEMENTATION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                setProcessSOAPHeaders(PROCESS_SOAP_HEADERS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                setLoadDefaultNamespacePackageNameMapping(LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                setLoadDefaultExcludesNamepsaceMapping(LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                setValidate(VALIDATE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                setWsdlVersion(WSDL_VERSION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                setUseDefaultValues(USE_DEFAULT_VALUES_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                setXjcArgs(XJC_ARGS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                setNoAddressBinding(NO_ADDRESS_BINDING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                setXjcUseDefaultValues(XJC_USE_DEFAULT_VALUES_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                setXjcToString(XJC_TO_STRING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                setXjcToStringMultiLine(XJC_TO_STRING_MULTI_LINE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                setXjcToStringSimple(XJC_TO_STRING_SIMPLE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                setXjcLocator(XJC_LOCATOR_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                setXjcSyncMethods(XJC_SYNC_METHODS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                setXjcMarkGenerated(XJC_MARK_GENERATED_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                setXjcEpisodeFile(XJC_EPISODE_FILE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                setAutoNameResolution(AUTO_NAME_RESOLUTION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                setIncludedNamespaces((Map<String, String>)null);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                getBindingFiles().clear();
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                setExcludedNamespaces((Map<String, String>)null);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                setCatalogFile(CATALOG_FILE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                setJavaSourceFolder(JAVA_SOURCE_FOLDER_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                return generateImplementation != GENERATE_IMPLEMENTATION_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                return processSOAPHeaders != PROCESS_SOAP_HEADERS_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                return loadDefaultNamespacePackageNameMapping != LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                return loadDefaultExcludesNamepsaceMapping != LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                return validate != VALIDATE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                return WSDL_VERSION_EDEFAULT == null ? wsdlVersion != null : !WSDL_VERSION_EDEFAULT.equals(wsdlVersion);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                return useDefaultValues != USE_DEFAULT_VALUES_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                return XJC_ARGS_EDEFAULT == null ? xjcArgs != null : !XJC_ARGS_EDEFAULT.equals(xjcArgs);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                return noAddressBinding != NO_ADDRESS_BINDING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                return xjcUseDefaultValues != XJC_USE_DEFAULT_VALUES_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                return xjcToString != XJC_TO_STRING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                return xjcToStringMultiLine != XJC_TO_STRING_MULTI_LINE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                return xjcToStringSimple != XJC_TO_STRING_SIMPLE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                return xjcLocator != XJC_LOCATOR_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                return xjcSyncMethods != XJC_SYNC_METHODS_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                return xjcMarkGenerated != XJC_MARK_GENERATED_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                return XJC_EPISODE_FILE_EDEFAULT == null ? xjcEpisodeFile != null : !XJC_EPISODE_FILE_EDEFAULT.equals(xjcEpisodeFile);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                return autoNameResolution != AUTO_NAME_RESOLUTION_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                return includedNamespaces != null;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                return bindingFiles != null && !bindingFiles.isEmpty();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                return excludedNamespaces != null;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                return CATALOG_FILE_EDEFAULT == null ? catalogFile != null : !CATALOG_FILE_EDEFAULT.equals(catalogFile);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                return JAVA_SOURCE_FOLDER_EDEFAULT == null ? javaSourceFolder != null : !JAVA_SOURCE_FOLDER_EDEFAULT.equals(javaSourceFolder);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == WSDL2JavaContext.class) {
-            switch (derivedFeatureID) {
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE: return CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION;
-                default: return -1;
-            }
-        }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == WSDL2JavaContext.class) {
-            switch (baseFeatureID) {
-                case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION;
-                default: return -1;
-            }
-        }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (generateImplementation: ");
-        result.append(generateImplementation);
-        result.append(", processSOAPHeaders: ");
-        result.append(processSOAPHeaders);
-        result.append(", loadDefaultNamespacePackageNameMapping: ");
-        result.append(loadDefaultNamespacePackageNameMapping);
-        result.append(", loadDefaultExcludesNamepsaceMapping: ");
-        result.append(loadDefaultExcludesNamepsaceMapping);
-        result.append(", validate: ");
-        result.append(validate);
-        result.append(", wsdlVersion: ");
-        result.append(wsdlVersion);
-        result.append(", useDefaultValues: ");
-        result.append(useDefaultValues);
-        result.append(", xjcArgs: ");
-        result.append(xjcArgs);
-        result.append(", noAddressBinding: ");
-        result.append(noAddressBinding);
-        result.append(", xjcUseDefaultValues: ");
-        result.append(xjcUseDefaultValues);
-        result.append(", xjcToString: ");
-        result.append(xjcToString);
-        result.append(", xjcToStringMultiLine: ");
-        result.append(xjcToStringMultiLine);
-        result.append(", xjcToStringSimple: ");
-        result.append(xjcToStringSimple);
-        result.append(", xjcLocator: ");
-        result.append(xjcLocator);
-        result.append(", xjcSyncMethods: ");
-        result.append(xjcSyncMethods);
-        result.append(", xjcMarkGenerated: ");
-        result.append(xjcMarkGenerated);
-        result.append(", xjcEpisodeFile: ");
-        result.append(xjcEpisodeFile);
-        result.append(", autoNameResolution: ");
-        result.append(autoNameResolution);
-        result.append(", includedNamespaces: ");
-        result.append(includedNamespaces);
-        result.append(", bindingFiles: ");
-        result.append(bindingFiles);
-        result.append(", excludedNamespaces: ");
-        result.append(excludedNamespaces);
-        result.append(", catalogFile: ");
-        result.append(catalogFile);
-        result.append(", javaSourceFolder: ");
-        result.append(javaSourceFolder);
-        result.append(')');
-        return result.toString();
-    }
-
-} //WSDL2JavaDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
deleted file mode 100644
index 4ab8047..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFAdapterFactory.java,v 1.2 2009/01/26 15:28:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFAdapterFactory extends AdapterFactoryImpl {
-    /**
-     * The cached model package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected static CXFPackage modelPackage;
-
-    /**
-     * Creates an instance of the adapter factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFAdapterFactory() {
-        if (modelPackage == null) {
-            modelPackage = CXFPackage.eINSTANCE;
-        }
-    }
-
-    /**
-     * Returns whether this factory is applicable for the type of the object.
-     * <!-- begin-user-doc -->
-     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-     * <!-- end-user-doc -->
-     * @return whether this factory is applicable for the type of the object.
-     * @generated
-     */
-    @Override
-    public boolean isFactoryForType(Object object) {
-        if (object == modelPackage) {
-            return true;
-        }
-        if (object instanceof EObject) {
-            return ((EObject)object).eClass().getEPackage() == modelPackage;
-        }
-        return false;
-    }
-
-    /**
-     * The switch that delegates to the <code>createXXX</code> methods.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected CXFSwitch<Adapter> modelSwitch =
-        new CXFSwitch<Adapter>() {
-            @Override
-            public Adapter caseCXFContext(CXFContext object) {
-                return createCXFContextAdapter();
-            }
-            @Override
-            public Adapter caseCXFDataModel(CXFDataModel object) {
-                return createCXFDataModelAdapter();
-            }
-            @Override
-            public Adapter caseJava2WSContext(Java2WSContext object) {
-                return createJava2WSContextAdapter();
-            }
-            @Override
-            public Adapter caseJava2WSDataModel(Java2WSDataModel object) {
-                return createJava2WSDataModelAdapter();
-            }
-            @Override
-            public Adapter caseWSDL2JavaContext(WSDL2JavaContext object) {
-                return createWSDL2JavaContextAdapter();
-            }
-            @Override
-            public Adapter caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
-                return createWSDL2JavaDataModelAdapter();
-            }
-            @Override
-            public Adapter defaultCase(EObject object) {
-                return createEObjectAdapter();
-            }
-        };
-
-    /**
-     * Creates an adapter for the <code>target</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param target the object to adapt.
-     * @return the adapter for the <code>target</code>.
-     * @generated
-     */
-    @Override
-    public Adapter createAdapter(Notifier target) {
-        return modelSwitch.doSwitch((EObject)target);
-    }
-
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @generated
-     */
-    public Adapter createCXFContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
-     * @generated
-     */
-    public Adapter createCXFDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @generated
-     */
-    public Adapter createJava2WSContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
-     * @generated
-     */
-    public Adapter createJava2WSDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @generated
-     */
-    public Adapter createWSDL2JavaContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
-     * @generated
-     */
-    public Adapter createWSDL2JavaDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for the default case.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @generated
-     */
-    public Adapter createEObjectAdapter() {
-        return null;
-    }
-
-} //CXFAdapterFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
deleted file mode 100644
index 4c0f84b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFSwitch.java,v 1.1 2008/11/10 20:37:45 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFSwitch<T> {
-    /**
-     * The cached model package
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected static CXFPackage modelPackage;
-
-    /**
-     * Creates an instance of the switch.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFSwitch() {
-        if (modelPackage == null) {
-            modelPackage = CXFPackage.eINSTANCE;
-        }
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    public T doSwitch(EObject theEObject) {
-        return doSwitch(theEObject.eClass(), theEObject);
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    protected T doSwitch(EClass theEClass, EObject theEObject) {
-        if (theEClass.eContainer() == modelPackage) {
-            return doSwitch(theEClass.getClassifierID(), theEObject);
-        }
-        else {
-            List<EClass> eSuperTypes = theEClass.getESuperTypes();
-            return
-                eSuperTypes.isEmpty() ?
-                    defaultCase(theEObject) :
-                    doSwitch(eSuperTypes.get(0), theEObject);
-        }
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    protected T doSwitch(int classifierID, EObject theEObject) {
-        switch (classifierID) {
-            case CXFPackage.CXF_CONTEXT: {
-                CXFContext cxfContext = (CXFContext)theEObject;
-                T result = caseCXFContext(cxfContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.CXF_DATA_MODEL: {
-                CXFDataModel cxfDataModel = (CXFDataModel)theEObject;
-                T result = caseCXFDataModel(cxfDataModel);
-                if (result == null) result = caseCXFContext(cxfDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.JAVA2_WS_CONTEXT: {
-                Java2WSContext java2WSContext = (Java2WSContext)theEObject;
-                T result = caseJava2WSContext(java2WSContext);
-                if (result == null) result = caseCXFContext(java2WSContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.JAVA2_WS_DATA_MODEL: {
-                Java2WSDataModel java2WSDataModel = (Java2WSDataModel)theEObject;
-                T result = caseJava2WSDataModel(java2WSDataModel);
-                if (result == null) result = caseCXFDataModel(java2WSDataModel);
-                if (result == null) result = caseJava2WSContext(java2WSDataModel);
-                if (result == null) result = caseCXFContext(java2WSDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.WSDL2_JAVA_CONTEXT: {
-                WSDL2JavaContext wsdl2JavaContext = (WSDL2JavaContext)theEObject;
-                T result = caseWSDL2JavaContext(wsdl2JavaContext);
-                if (result == null) result = caseCXFContext(wsdl2JavaContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL: {
-                WSDL2JavaDataModel wsdl2JavaDataModel = (WSDL2JavaDataModel)theEObject;
-                T result = caseWSDL2JavaDataModel(wsdl2JavaDataModel);
-                if (result == null) result = caseCXFDataModel(wsdl2JavaDataModel);
-                if (result == null) result = caseWSDL2JavaContext(wsdl2JavaDataModel);
-                if (result == null) result = caseCXFContext(wsdl2JavaDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            default: return defaultCase(theEObject);
-        }
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseCXFContext(CXFContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseCXFDataModel(CXFDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseJava2WSContext(Java2WSContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseJava2WSDataModel(Java2WSDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseWSDL2JavaContext(WSDL2JavaContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch, but this is the last case anyway.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-     * @generated
-     */
-    public T defaultCase(EObject object) {
-        return null;
-    }
-
-} //CXFSwitch
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
deleted file mode 100644
index 03c8e99..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the <code>IJavaProject</code> src folder.
- *
- */
-public class JavaResourceChangeListener implements IResourceChangeListener {
-    private List<IResource> changedResources = new ArrayList<IResource>();
-
-    private IPath sourceDirectoryPath;
-
-    /**
-     * Constructs a JavaResourceChangeListener instance.
-     *
-     * @param sourceDirectoryPath
-     */
-    public JavaResourceChangeListener(IPath sourceDirectoryPath) {
-        this.sourceDirectoryPath = sourceDirectoryPath;
-    }
-
-    public void resourceChanged(IResourceChangeEvent event) {
-        if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
-            return;
-        }
-        IResourceDelta rootDelta = event.getDelta();
-
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IFolder srcFolder = workspaceRoot.getFolder(sourceDirectoryPath);
-        IPath srcFolderPath = srcFolder.getFullPath();
-        if (!srcFolderPath.hasTrailingSeparator()) {
-            srcFolderPath = srcFolderPath.addTrailingSeparator();
-        }
-
-        IResourceDelta javaResourceDelta = rootDelta.findMember(srcFolderPath);
-
-        if (javaResourceDelta == null) {
-            return;
-        }
-
-        IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
-            public boolean visit(IResourceDelta delta) {
-                if (delta.getKind() != IResourceDelta.ADDED) {
-                    return true;
-                }
-                IResource resource = delta.getResource();
-                changedResources.add(resource);
-                return true;
-            }
-        };
-        try {
-            javaResourceDelta.accept(visitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-
-    public List<IResource> getChangedResources() {
-        return changedResources;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
deleted file mode 100644
index 940b1cc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the web projects WebContent folder.
- * 
- */
-@SuppressWarnings("restriction")
-public class WebContentChangeListener implements IResourceChangeListener {
-    private List<IResource> changedResources = new ArrayList<IResource>();
-
-    private String projectName;
-    
-    public WebContentChangeListener(String projectName) {
-        this.projectName = projectName;
-    }
-    
-    public void resourceChanged(IResourceChangeEvent event) {
-        if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
-            return;
-        }
-        IResourceDelta rootDelta = event.getDelta();
-
-        IPath webContentPath = J2EEUtils.getWebContentPath(ResourcesPlugin.getWorkspace().getRoot()
-                .getProject(projectName));
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-        }
-        
-        IResourceDelta webResourceDelta = rootDelta.findMember(webContentPath); //$NON-NLS-1$
-        if (webResourceDelta == null) {
-            return;
-        }
-
-        IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
-            public boolean visit(IResourceDelta delta) {
-                if (delta.getKind() != IResourceDelta.ADDED) {
-                    return true;
-                }
-                IResource resource = delta.getResource();
-                changedResources.add(resource);
-                return true;
-            }
-        };
-        try {
-            webResourceDelta.accept(visitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-    
-    public List<IResource> getChangedResources() {
-        return changedResources;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
deleted file mode 100644
index 0b245dd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.TextEdit;
-import org.osgi.framework.Version;
-
-/**
- * Provides utility methods for working with the CXF model.
- * Also serving as an interim class to aid in refactoring core utilities into jaxws core.
- *
- */
-public final class CXFModelUtils {
-    private static final Version v_0_0_0 = new Version("0.0.0");
-    private static final Version v_2_1 = new Version(CXFCorePlugin.CXF_VERSION_2_1);
-    private static final Version v_2_0_7 = new Version("2.0.7");
-    private static final Version v_2_1_1 = new Version("2.1.1");
-
-    public static final String WEB_SERVICE = "WebService"; //$NON-NLS-1$
-    public static final String WEB_METHOD = "WebMethod"; //$NON-NLS-1$
-    public static final String WEB_PARAM = "WebParam"; //$NON-NLS-1$
-    public static final String REQUEST_WRAPPER = "RequestWrapper"; //$NON-NLS-1$
-    public static final String RESPONSE_WRAPPER = "ResponseWrapper"; //$NON-NLS-1$
-
-    private static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
-
-    private static Map<String, String> ANNOTATION_TYPENAME_MAP = new HashMap<String, String>();
-
-    static {
-        ANNOTATION_TYPENAME_MAP.put("ServiceMode", "javax.xml.ws.ServiceMode"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebFault", "javax.xml.ws.WebFault"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(REQUEST_WRAPPER, "javax.xml.ws.RequestWrapper"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put(RESPONSE_WRAPPER, "javax.xml.ws.ResponseWrapper"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceClient", "javax.xml.ws.WebServiceClient"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebEndpoint", "javax.xml.ws.WebEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceProvider", "javax.xml.ws.WebServiceProvider"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("BindingType", "javax.xml.ws.BindingType"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceRef", "javax.xml.ws.WebServiceRef"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceRefs", "javax.xml.ws.WebServiceRefs"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(WEB_SERVICE, "javax.jws.WebService"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put(WEB_METHOD, "javax.jws.WebMethod"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put("Oneway", "javax.jws.OneWay"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(WEB_PARAM, "javax.jws.WebParam"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put("WebResult", "javax.jws.WebResult"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("SOAPBinding", "javax.jws.SOAPBinding"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("HandlerChain", "javax.jws.HandlerChain"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    private CXFModelUtils() {
-    }
-
-    public static void getWebServiceAnnotationChange(IType type, Java2WSDataModel model,
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        NormalAnnotation webServiceAnnotation = getAnnotation(type, WebService.class);
-        if (webServiceAnnotation != null && model.isUseServiceEndpointInterface() && type.isClass()) {
-            MemberValuePair endpointInterface = getMemberValuePair(webServiceAnnotation, ENDPOINT_INTERFACE);
-            if (endpointInterface != null && endpointInterface.getValue() instanceof StringLiteral) {
-                StringLiteral stringLiteral = (StringLiteral) endpointInterface.getValue();
-                if (!stringLiteral.getLiteralValue().equals(model.getServiceEndpointInterfaceName())) {
-                    ASTNode newSEIValue = AnnotationsCore.createStringLiteral(ast, model
-                            .getServiceEndpointInterfaceName());
-
-                    textFileChange.addEdit(AnnotationUtils.createUpdateMemberValuePairTextEdit(endpointInterface, newSEIValue));
-                }
-            } else {
-                MemberValuePair endpointInterfacePair = AnnotationsCore.createMemberValuePair(ast,
-                        ENDPOINT_INTERFACE, AnnotationsCore.createStringLiteral(ast, model
-                                .getServiceEndpointInterfaceName()));
-
-                textFileChange.addEdit(AnnotationUtils.createAddMemberValuePairTextEdit(webServiceAnnotation, endpointInterfacePair));
-            }
-        } else {
-            IAnnotationAttributeInitializer annotationAttributeInitializer =
-                AnnotationsManager.getAnnotationDefinitionForClass(WebService.class).
-                    getAnnotationAttributeInitializer();
-
-            List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(type, ast,
-                    WebService.class);
-
-            if (model.isUseServiceEndpointInterface() && type.isClass()) {
-                MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                        ENDPOINT_INTERFACE, model.getServiceEndpointInterfaceName());
-                memberValuePairs.add(1, endpointInterfaceValuePair);
-            }
-
-            Annotation annotation = AnnotationsCore.createNormalAnnotation(ast, WebService.class.getSimpleName(), memberValuePairs);
-
-            textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(source.findPrimaryType(), annotation));
-        }
-    }
-
-    private static NormalAnnotation getAnnotation(IType type, Class<? extends java.lang.annotation.Annotation> annotation) {
-        Annotation jdtAnnotation = AnnotationUtils.getAnnotation(type, annotation);
-        if (jdtAnnotation != null && jdtAnnotation instanceof NormalAnnotation) {
-            return (NormalAnnotation) jdtAnnotation;
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static MemberValuePair getMemberValuePair(NormalAnnotation annotation, String memberName) {
-        List<MemberValuePair> memberValuePairs = annotation.values();
-        for (MemberValuePair memberValuePair : memberValuePairs) {
-            if (memberValuePair.getName().getIdentifier().equals(memberName)) {
-                return memberValuePair;
-            }
-        }
-        return null;
-    }
-
-    public static void createMethodAnnotationChange(IType type, IMethod method,
-            Class<? extends java.lang.annotation.Annotation> annotationClass, TextFileChange textFileChange)
-                throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        Annotation annotation = getAnnotation(method, ast, annotationClass);
-
-        textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-    }
-
-    public static void getWebMethodAnnotationChange(IType type, IMethod method,
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        Annotation annotation = getAnnotation(method, ast, WebMethod.class);
-
-        textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-    }
-
-    public static void getRequestWrapperAnnotationChange(IType type, IMethod method,
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        Annotation annotation = getAnnotation(method, ast, RequestWrapper.class);
-
-        textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-    }
-
-    public static void getResponseWrapperAnnotationChange(IType type, IMethod method,
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        Annotation annotation = getAnnotation(method, ast, ResponseWrapper.class);
-
-        textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(method, annotation));
-    }
-
-    public static void getWebParamAnnotationChange(IType type, final IMethod method,
-            ILocalVariable parameter, TextFileChange textFileChange)
-            throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = SharedASTProvider.getAST(source, SharedASTProvider.WAIT_YES, null);
-
-        AST ast = compilationUnit.getAST();
-
-        Annotation annotation = getAnnotation(parameter, ast, WebParam.class);
-
-        textFileChange.addEdit(AnnotationUtils.createAddAnnotationTextEdit(parameter, annotation));
-    }
-
-    private static Annotation getAnnotation(IJavaElement javaElement, AST ast,
-                Class<? extends java.lang.annotation.Annotation> annotationClass) {
-
-        IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager.
-            getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-
-        List<MemberValuePair> memberValuePairs =
-                annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
-
-        return AnnotationsCore.createNormalAnnotation(ast, annotationClass.getSimpleName(), memberValuePairs);
-    }
-
-    public static void getImportsChange(ICompilationUnit compilationUnit, Java2WSDataModel model,
-            TextFileChange textFileChange, boolean classOnly) {
-        try {
-
-            ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-
-            importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(WEB_SERVICE));
-
-            if (!classOnly) {
-                Map<IMethod, Map<String, Boolean>> methodAnnotationMap = model.getMethodMap();
-                Set<Entry<IMethod, Map<String, Boolean>>> methodAnnotationSet = methodAnnotationMap.entrySet();
-                for (Map.Entry<IMethod, Map<String, Boolean>> methodAnnotation : methodAnnotationSet) {
-                    Map<String, Boolean> methodMap = methodAnnotation.getValue();
-                    Set<Entry<String, Boolean>> methodSet = methodMap.entrySet();
-                    for (Map.Entry<String, Boolean> method : methodSet) {
-                        if (ANNOTATION_TYPENAME_MAP.containsKey(method.getKey()) && method.getValue()) {
-                            importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(method.getKey()));
-                        }
-                    }
-                }
-            }
-            if (importRewrite.hasRecordedChanges()) {
-                    TextEdit importTextEdit = importRewrite.rewriteImports(null);
-                    textFileChange.addEdit(importTextEdit);
-            }
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-
-    /**
-     * Loads all public methods with the default annotation maps
-     * @return
-     */
-    public static Map<IMethod, Map<String, Boolean>> getMethodMap(IType type, Java2WSDataModel model) {
-        Map<IMethod, Map<String, Boolean>> methodMap = new HashMap<IMethod, Map<String, Boolean>>();
-
-        try {
-            IMethod[] methods = type.getMethods();
-            for (IMethod method : methods) {
-                if (type.isInterface()) {
-                    methodMap.put(method, getAnnotationMap(model));
-                } else if (type.isClass() && JDTUtils.isPublicMethod(method)) {
-                    methodMap.put(method, getAnnotationMap(model));
-                }
-            }
-        } catch (JavaModelException jme) {
-            CXFCorePlugin.log(jme.getStatus());
-        }
-        return methodMap;
-    }
-
-    public static Map<String, Boolean> getAnnotationMap(Java2WSDataModel model) {
-        Map<String, Boolean> annotationdMap = new HashMap<String, Boolean>();
-        annotationdMap.put(CXFModelUtils.WEB_METHOD, model.isGenerateWebMethodAnnotation());
-        annotationdMap.put(CXFModelUtils.WEB_PARAM, model.isGenerateWebParamAnnotation());
-        annotationdMap.put(CXFModelUtils.REQUEST_WRAPPER, model.isGenerateRequestWrapperAnnotation());
-        annotationdMap.put(CXFModelUtils.RESPONSE_WRAPPER, model.isGenerateResponseWrapperAnnotation());
-        return annotationdMap;
-    }
-
-    /**
-     * CXF wsdl2java -autoNameResolution is supported in the CXF 2.0 stream from 2.0.7
-     * and in the CXF 2.1 stream from 2.1.1 up.
-     *
-     * @param cxfRuntimeVersion
-     * @return
-     */
-    public static boolean isAutoNameResolutionPermitted() {
-        Version currentVersion = CXFCorePlugin.getDefault().getCurrentRuntimeVersion();
-        //On startup with clean workspace show by default.
-        if (currentVersion.compareTo(v_0_0_0) == 0) {
-            return true;
-        }
-
-        if (currentVersion.compareTo(CXFModelUtils.v_2_1_1) >= 0) {
-            return true;
-        }
-
-        if (currentVersion.compareTo(CXFModelUtils.v_2_0_7) >= 0
-                && currentVersion.compareTo(CXFModelUtils.v_2_1) < 0) {
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean getDefaultBooleanValue(int classifierID, int featureID) {
-        Object defaultValue = null;
-
-        if (classifierID == CXFPackage.CXF_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_ExportCXFClasspathContainer()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__VERBOSE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_Verbose().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_UseSpringApplicationContext()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_CLIENT:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateClient().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_SERVER:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateServer().getDefaultValue();
-                break;
-            }
-        }
-
-        if (classifierID == CXFPackage.JAVA2_WS_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_Soap12Binding().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateXSDImports().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWSDL().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation()
-                        .getDefaultValue();
-                break;
-            }
-        }
-
-        if (classifierID == CXFPackage.WSDL2_JAVA_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_NoAddressBinding().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_UseDefaultValues().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_AutoNameResolution()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_GenerateImplementation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_Validate().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                defaultValue = CXFPackage.eINSTANCE
-                        .getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToString().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringSimple().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcLocator().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcSyncMethods().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated().getDefaultValue();
-                break;
-            }
-        }
-
-        if (defaultValue != null && defaultValue instanceof Boolean) {
-            return ((Boolean) defaultValue).booleanValue();
-        }
-
-        return false;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
deleted file mode 100644
index 59750f3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-@SuppressWarnings("restriction")
-public final class CommandLineUtils {
-    // Java2WSDL
-    private static String OUT_FILE = "-o"; //$NON-NLS-1$
-    private static String RESOURCE_DIR = "-d"; //$NON-NLS-1$
-    private static String SOURCE_DIR = "-s"; //$NON-NLS-1$
-    private static String CLASS_DIR = "-classdir"; //$NON-NLS-1$
-    private static String J2W_CLASSPATH = "-cp"; //$NON-NLS-1$
-    private static String INC_SOAP12 = "-soap12"; //$NON-NLS-1$
-    private static String TARGET_NAMESPACE = "-t"; //$NON-NLS-1$
-    private static String J2W_SERVICE_NAME = "-servicename"; //$NON-NLS-1$
-    private static String PORT_NAME = "-portname"; //$NON-NLS-1$
-    private static String GEN_XSD_IMPORTS = "-createxsdimports"; //$NON-NLS-1$
-    private static String VERBOSE = "-verbose"; //$NON-NLS-1$
-
-    // Java2WS
-    private static String J2W_FRONTEND = "-frontend"; //$NON-NLS-1$
-    private static String J2W_DATABINDING = "-databinding"; //$NON-NLS-1$
-    private static String BEAN_PATH = "-beans"; //$NON-NLS-1$
-    private static String GEN_WSDL = "-wsdl"; //$NON-NLS-1$
-    private static String GEN_CLIENT = "-client"; //$NON-NLS-1$
-    private static String GEN_SERVER = "-server"; //$NON-NLS-1$
-    private static String GEN_WRAPPER_FAULT = "-wrapperbean"; //$NON-NLS-1$
-
-    private static String W2J_PACKAGE_NAME = "-p"; //$NON-NLS-1$
-    private static String W2J_BINDING_NAME = "-b"; //$NON-NLS-1$
-
-    private static String W2J_FRONTEND = "-fe"; //$NON-NLS-1$
-    private static String W2J_DATABINDING = "-db"; //$NON-NLS-1$
-    private static String W2J_WSDL_VERSION = "-wv"; //$NON-NLS-1$
-    private static String W2J_SERVICE_NAME = "-sn"; //$NON-NLS-1$
-    private static String W2J_CATALOG = "-catalog"; //$NON-NLS-1$
-    private static String W2J_COMPILE = "-compile"; //$NON-NLS-1$
-    private static String W2J_GEN_IMPL = "-impl"; //$NON-NLS-1$
-    private static String W2J_GEN_ALL = "-all"; //$NON-NLS-1$
-    private static String W2J_NO_OVERWRITE = "-keep"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_VALUES = "-defaultValues"; //$NON-NLS-1$
-    private static String W2J_AUTO_NAME_RESOLUTION = "-autoNameResolution"; //$NON-NLS-1$
-    private static String W2J_EXCLUDE_NAMESPACE = "-nexclude"; //$NON-NLS-1$
-    private static String W2J_EXT_SOAP_HEADER = "-exsh"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_NAMESPACE = "-dns"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_EXCLUDE_NS = "-dex"; //$NON-NLS-1$
-    private static String W2J_WSDL_LOCATION = "-wsdlLocation"; //$NON-NLS-1$
-    private static String W2J_XJC_ARGS = "-xjc"; //$NON-NLS-1$
-    private static String W2J_NO_ADDRESS_BINDING = "-noAddressBinding"; //$NON-NLS-1$
-    private static String W2J_VALIDATE_WSDL = "-validate"; //$NON-NLS-1$
-
-    // XJC
-    private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
-    private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
-    private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
-    private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
-    private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
-    private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
-    private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
-    private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
-    private CommandLineUtils() {
-    }
-
-    public static String[] getJava2WSProgramArguments(Java2WSDataModel model) {
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(model.getProjectName());
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            String className = model.getJavaStartingPoint();
-            if (model.isUseServiceEndpointInterface() && model.getFullyQualifiedJavaClassName() != null) {
-                className = model.getFullyQualifiedJavaClassName();
-            }
-            // Add all the earlier wsdl2java tool options
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardJava2WSDLProgramArguments(model)));
-
-            if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-                progArgs.add(J2W_FRONTEND);
-                progArgs.add(model.getFrontend().getLiteral());
-
-                progArgs.add(J2W_DATABINDING);
-                progArgs.add(model.getDatabinding().getLiteral());
-
-                // progArgs.add(BEAN_PATH);
-                // progArgs.add("BEAN_PATH");
-
-                if (model.isGenerateWSDL()) {
-                    progArgs.add(GEN_WSDL);
-                } else {
-                    progArgs.remove(OUT_FILE);
-                    progArgs.remove(model.getWsdlFileName());
-                }
-
-                if (model.isGenerateClient()) {
-                    progArgs.add(GEN_CLIENT);
-                }
-
-                if (model.isGenerateServer()) {
-                    progArgs.add(GEN_SERVER);
-                }
-
-                if (model.isGenerateWrapperFaultBeans()) {
-                    progArgs.add(GEN_WRAPPER_FAULT);
-                }
-            }
-
-            progArgs.add(className);
-        }
-        return progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    private static String[] getStandardJava2WSDLProgramArguments(Java2WSDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-        progArgs.add(J2W_CLASSPATH);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
-        progArgs.add(SOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
-        progArgs.add(RESOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/wsdl"); //$NON-NLS-1$
-
-        progArgs.add(CLASS_DIR);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
-        progArgs.add(OUT_FILE);
-        progArgs.add(model.getWsdlFileName());
-
-        if (model.isSoap12Binding()) {
-            progArgs.add(INC_SOAP12);
-        }
-        if (model.isGenerateXSDImports()) {
-            progArgs.add(GEN_XSD_IMPORTS);
-        }
-
-        if (model.isVerbose()) {
-            progArgs.add(VERBOSE);
-        }
-
-        return progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    public static String[] getWSDL2JavaProgramArguments(WSDL2JavaDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            // Add Standard args
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardWSDL2JavaProgramArguments(model,
-                    projectName)));
-
-            String serviceName = model.getServiceName();
-            if (serviceName != null && serviceName.length() > 0) {
-                progArgs.add(W2J_SERVICE_NAME);
-                progArgs.add(serviceName);
-            }
-
-            if (model.isUseDefaultValues()) {
-                progArgs.add(W2J_DEFAULT_VALUES);
-            }
-
-            if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-                progArgs.add(W2J_FRONTEND);
-                progArgs.add(model.getFrontend().getLiteral());
-
-                progArgs.add(W2J_DATABINDING);
-                progArgs.add(model.getDatabinding().getLiteral());
-
-                progArgs.add(W2J_WSDL_VERSION);
-                progArgs.add(model.getWsdlVersion());
-
-                if (model.isNoAddressBinding()) {
-                    progArgs.add(W2J_NO_ADDRESS_BINDING);
-                }
-            }
-
-            progArgs.add(model.getWsdlURL().toExternalForm());
-        }
-        return progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    public static String[] getWSDL2JavaGenerateClientArguments(WSDL2JavaDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            progArgs.add(GEN_CLIENT);
-
-            // Add WSLD2Java args
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getWSDL2JavaProgramArguments(model)));
-        }
-        return progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    public static String[] getStandardWSDL2JavaProgramArguments(WSDL2JavaDataModel model, String projectName) {
-        List<String> progArgs = new ArrayList<String>();
-        progArgs.add(RESOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
-        progArgs.add(CLASS_DIR);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName).toOSString());
-
-        Map<String, String> includedNamespaces = model.getIncludedNamespaces();
-        if (includedNamespaces != null && model.getIncludedNamespaces().size() > 0) {
-            Set<Map.Entry<String, String>> includedNamespacesEntrySet = includedNamespaces.entrySet();
-            for (Map.Entry<String, String> entry : includedNamespacesEntrySet) {
-                progArgs.add(W2J_PACKAGE_NAME);
-                String wsdlNamespace = entry.getKey();
-                String packageName = entry.getValue();
-                progArgs.add(wsdlNamespace + "=" + packageName); //$NON-NLS-1$
-            }
-        }
-
-        List<String> bindingFiles = model.getBindingFiles();
-        if (!bindingFiles.isEmpty()) {
-            for (String bindingFile : bindingFiles) {
-                progArgs.add(W2J_BINDING_NAME);
-                progArgs.add(bindingFile);
-            }
-        }
-
-        if (model.isGenerateServer()) {
-            progArgs.add(GEN_SERVER);
-        }
-
-        if (model.isGenerateImplementation()) {
-            progArgs.add(W2J_GEN_IMPL);
-        }
-
-        if(model.isValidate()) {
-            progArgs.add(W2J_VALIDATE_WSDL);
-        }
-
-        progArgs.add(W2J_EXT_SOAP_HEADER);
-        progArgs.add(Boolean.toString(model.isProcessSOAPHeaders()));
-
-        progArgs.add(W2J_DEFAULT_NAMESPACE);
-        progArgs.add(Boolean.toString(model.isLoadDefaultNamespacePackageNameMapping()));
-
-        progArgs.add(W2J_DEFAULT_EXCLUDE_NS);
-        progArgs.add(Boolean.toString(model.isLoadDefaultExcludesNamepsaceMapping()));
-
-        if (model.isAutoNameResolution() && CXFModelUtils.isAutoNameResolutionPermitted()) {
-            progArgs.add(W2J_AUTO_NAME_RESOLUTION);
-        }
-
-        String xjcArgs = CommandLineUtils.getXJCArgs(model);
-        if (xjcArgs.trim().length() > 0) {
-            progArgs.add(W2J_XJC_ARGS + xjcArgs);
-        }
-
-        if (model.getWsdlLocation() != null) {
-            progArgs.add(W2J_WSDL_LOCATION);
-            progArgs.add(model.getWsdlLocation());
-        }
-
-        if (model.isVerbose()) {
-            progArgs.add(VERBOSE);
-        }
-        return progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    private static String getXJCArgs(WSDL2JavaDataModel model) {
-        List<String> xjcArgs = new ArrayList<String>();
-        if (model.isXjcUseDefaultValues()) {
-            xjcArgs.add(XJC_DV_ARG);
-        }
-        if (model.isXjcToString()) {
-            xjcArgs.add(XJC_TS_ARG);
-        }
-        if (model.isXjcToStringMultiLine()) {
-            xjcArgs.add(XJC_TS_MULTI_ARG);
-        }
-        if (model.isXjcToStringSimple()) {
-            xjcArgs.add(XJC_TS_SIMPLE);
-        }
-        if (model.isXjcLocator()) {
-            xjcArgs.add(XJC_LOCATOR_ARG);
-        }
-        if (model.isXjcSyncMethods()) {
-            xjcArgs.add(XJC_SYNC_METHODS_ARG);
-        }
-        if (model.isXjcMarkGenerated()) {
-            xjcArgs.add(XJC_MARK_GENERATED_ARG);
-        }
-
-        String xjcArg = xjcArgs.toString();
-        xjcArg = xjcArg.replace('[', ' ');
-        xjcArg = xjcArg.replace(']', ' ');
-
-        xjcArg = xjcArg.replaceAll("\\s", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-        return xjcArg.trim();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
deleted file mode 100644
index 4dc3359..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.ui.internal.FormatProcessorsExtensionReader;
-
-@SuppressWarnings("restriction")
-public final class FileUtils {
-
-    private static final String TMP_FOLDER_NAME = ".cxftmp"; //$NON-NLS-1$
-
-    private FileUtils() {
-    }
-
-    public static IProject getProject(String projectName) {
-        return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    }
-    
-    public static void copyFolder(String source, String destination) {
-        File sourceFolder = new File(source);
-
-        String[] files = sourceFolder.list();
-        for (int i = 0; i < files.length; i++) {
-            File file = new File(sourceFolder + File.separator + files[i]);
-            if (file.isDirectory()) {
-                copyFolder(source, destination, files[i]);
-            } else {
-                copyFile(source, destination, files[i]);
-            }
-        }
-    }
-
-    private static void copyFolder(String sourceFolder, String targetFolder, String name) {
-        File target = new File(targetFolder + File.separator + name);
-        if (!target.exists()) {
-            target.mkdir();
-        }
-        copyFolder(sourceFolder + File.separator + name, targetFolder + File.separator + name);
-    }
-
-    public static void copyFile(String sourceFolder, String targetFolder, String fileName) {
-        File sourceFile = new File(sourceFolder + File.separator + fileName);
-        File targetFile = new File(targetFolder + File.separator + fileName);
-        if (!targetFile.exists()) {
-        	InputStream inputStream = null;
-            OutputStream outputStream = null;
-            try {
-		        inputStream = new FileInputStream(sourceFile);
-                outputStream = new FileOutputStream(targetFile);
-                byte[] buffer = new byte[102400];
-                while (true) {
-                    int numberOfBytes = inputStream.read(buffer);
-                    if (numberOfBytes < 0) {
-                        break;
-                    }
-                    outputStream.write(buffer, 0, numberOfBytes);
-                }
-
-            } catch (FileNotFoundException fnfe) {
-                CXFCorePlugin.log(fnfe);
-		    } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-			} finally {
-				try {
-				    if (inputStream != null) {
-				        inputStream.close();    
-				    }
-				    if (outputStream != null) {
-				        outputStream.close();    
-				    }
-				} catch(IOException ioe) {
-                    CXFCorePlugin.log(ioe);
-				}
-			}
-        } else {
-            if (sourceFile.getName().indexOf(".java") != -1) { //$NON-NLS-1$
-                MergeUtils.merge(sourceFile, targetFile);
-            }
-        }
-    }
-
-    public static String getTmpFolderName() {
-        return TMP_FOLDER_NAME;
-    }
-    
-    public static String getTmpFolder(String projectName) {
-        return FileUtils.getTmpFolder(FileUtils.getProject(projectName));
-    }
-
-    public static String getTmpFolder(IProject project) {
-        IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
-        if (!tmpFolder.exists()) {
-            try {
-                tmpFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        
-        IFolder tmpSrcFolder = tmpFolder.getFolder("src"); //$NON-NLS-1$
-        if (!tmpSrcFolder.exists()) {
-            try {
-                tmpSrcFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        
-        IFolder tmpWSDLFolder = tmpFolder.getFolder("wsdl"); //$NON-NLS-1$
-        if (!tmpWSDLFolder.exists()) {
-            try {
-                tmpWSDLFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        return tmpFolder.getLocation().toOSString();
-    }
-
-    public static void copyW2JFilesFromTmp(WSDL2JavaDataModel model) {
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
-        IProject project = workspaceRoot.getProject(model.getProjectName());
-        IFolder srcFolder = workspaceRoot.getFolder(new Path(model.getJavaSourceFolder()));
-        FileUtils.copyFolder(getTmpFolder(project) + "/src", srcFolder.getLocation().toOSString()); //$NON-NLS-1$
-
-        try {
-            srcFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-        deleteTmpFolder(project);
-    }
-
-    public static void copyJ2WFilesFromTmp(Java2WSDataModel model) {
-        String projectName = model.getProjectName();
-        IProject project = FileUtils.getProject(projectName);
-
-        IType type = JDTUtils.getType(JDTUtils.getJavaProject(projectName), model.getJavaStartingPoint());
-        IJavaElement javaElement = type.getPackageFragment().getParent();
-        IResource javaElementResource = javaElement.getResource();
-        if (javaElementResource instanceof IFolder) {
-            try {
-                IFolder srcDirectory = (IFolder) javaElementResource;
-                FileUtils.copyFolder(getTmpFolder(project) + "/src", srcDirectory.getLocation().toOSString()); //$NON-NLS-1$
-                srcDirectory.refreshLocal(IResource.DEPTH_INFINITE,  new NullProgressMonitor());
-                
-                if (model.isGenerateWSDL()) {
-                    IFolder wsdlFolder = WSDLUtils.getWSDLFolder(projectName);
-                    FileUtils.copyFolder(getTmpFolder(project) + "/wsdl", wsdlFolder.getLocation() //$NON-NLS-1$
-                            .toOSString());
-                    model.setConfigWsdlLocation(wsdlFolder.getName() + "/"  //$NON-NLS-1$
-                            + model.getWsdlFileName());
-                    wsdlFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-                }
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-
-        }
-        deleteTmpFolder(project);
-    }
-
-    private static IStatus deleteTmpFolder(IProject project) {
-        IStatus status = Status.OK_STATUS;
-
-        IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
-        if (tmpFolder.exists()) {
-            try {
-                tmpFolder.delete(true, false, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        return status;
-    }
-
-    public static boolean isFileInWebContentFolder(IProject project, IPath filePath) {
-    	IPath webContentPath = WSDLUtils.getWebContentFolder(project).getLocation();
-    	if (webContentPath.isPrefixOf(filePath)) {
-       		return true;
-    	}
-    	return false;
-    }
-    
-    public static boolean isFileInWorkspace(URL fileURL) {
-        IPath filePath = new Path(fileURL.getPath());
-
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IPath workspacePath = workspaceRoot.getLocation();
-        if (filePath.isValidPath(workspacePath.toOSString())) {
-        	return true;
-        }
-        return false;
-    }
-
-    public static void formatXMLFile(IFile file) {
-        if (file != null) {
-            try {
-                IContentDescription contentDescription = file.getContentDescription();
-                if (contentDescription == null) {
-                    return;
-                }
-                IContentType contentType = contentDescription.getContentType();
-                IStructuredFormatProcessor formatProcessor = FormatProcessorsExtensionReader.getInstance()
-                        .getFormatProcessor(contentType.getId());
-                if (formatProcessor != null) {
-                    formatProcessor.formatFile(file);
-                }
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-    
-    public static void refreshProject(String projectName, IProgressMonitor monitor) {
-        IProject project = FileUtils.getProject(projectName);
-        FileUtils.refreshProject(project, monitor);
-    }
-
-    public static void refreshProject(IProject project, IProgressMonitor monitor) {
-        try {
-            project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java
deleted file mode 100644
index 3d8ce3a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IConsoleView;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-import org.eclipse.ui.console.MessageConsole;
-
-public final class LaunchUtils {
-    
-    private LaunchUtils() {
-    }
-
-    public static IStatus launch(String[] runtimeClasspath, String className, String[] programArgs) {
-        IStatus status = Status.OK_STATUS;
-        try {
-            IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
-            IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
-            VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className,
-                    runtimeClasspath);
-            vmRunnerConfiguration.setProgramArguments(programArgs);
-
-            ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
-            vmRunner.run(vmRunnerConfiguration, launch, null);
-
-            while (!launch.isTerminated()) {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException ie) {
-                    CXFCorePlugin.log(ie);
-                }
-            }
-
-            IProcess[] processes = launch.getProcesses();
-            String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
-            if (outputStream != null && outputStream.length() > 0) {
-                status = new Status(IStatus.INFO, CXFCorePlugin.PLUGIN_ID, outputStream);
-            }
-
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce);
-        }
-        return status;
-    }
-
-    public static void launch(IJavaProject javaProject, String className, String[] programArgs)
-            throws CoreException {
-        IVMInstall vmInstall = JavaRuntime.getVMInstall(javaProject);
-        if (vmInstall == null) {
-            vmInstall = JavaRuntime.getDefaultVMInstall();
-        }
-
-        IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
-        String[] runtimeClasspath = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
-        VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className, runtimeClasspath);
-
-        vmRunnerConfiguration.setProgramArguments(programArgs);
-
-        if (vmInstall instanceof IVMInstall2) {
-            IVMInstall2 install2 = (IVMInstall2) vmInstall;
-            if (install2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
-                vmRunnerConfiguration.setVMArguments(new String[] { "-Djava.endorsed.dirs="
-                        + CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation() });
-            }
-        }
-
-        ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
-        vmRunner.run(vmRunnerConfiguration, launch, null);
-
-        while (!launch.isTerminated()) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ie) {
-                CXFCorePlugin.log(ie);
-            }
-        }
-
-        IProcess[] processes = launch.getProcesses();
-
-        String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
-        logStream(outputStream);
-        String errorStream = processes[0].getStreamsProxy().getErrorStreamMonitor().getContents();
-        logStream(errorStream);
-      
-        logErrorStreamContents(errorStream, className);
-    }
-
-    private static void logStream(String outputStream) {
-        try {
-            MessageConsole cxfConsole = getCXFConsole();
-            IWorkbench workbench = PlatformUI.getWorkbench();
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-            if (workbenchWindow != null) {
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                String console_view_id = IConsoleConstants.ID_CONSOLE_VIEW;
-                IConsoleView consoleView = (IConsoleView) workbenchPage.showView(console_view_id);
-                consoleView.display(cxfConsole);
-                IOConsoleOutputStream consoleOutputStream = cxfConsole.newOutputStream();
-                consoleOutputStream.write(outputStream);
-                consoleOutputStream.close();
-            }
-        } catch (PartInitException pie) {
-            CXFCorePlugin.log(pie);
-        } catch (IOException ioe) {
-            CXFCorePlugin.log(ioe);
-        }
-    }
-
-    private static MessageConsole getCXFConsole() {
-        ConsolePlugin consolePlugin = ConsolePlugin.getDefault();
-        IConsoleManager consoleManager = consolePlugin.getConsoleManager();
-        IConsole[] existingConsoles = consoleManager.getConsoles();
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        for (int i = 0; i < existingConsoles.length; i++) {
-           if (existingConsoles[i].getName().equals(context.getCxfRuntimeEdition() + " " 
-                   + context.getCxfRuntimeVersion())) {
-               return (MessageConsole) existingConsoles[i]; 
-           }
-        }
-        MessageConsole cxfConsole = new MessageConsole(context.getCxfRuntimeEdition() + " " 
-                + context.getCxfRuntimeVersion(),
-                CXFCorePlugin.imageDescriptorFromPlugin(CXFCorePlugin.PLUGIN_ID, 
-                        "icons/view16/console_view.gif")); //$NON-NLS-1$
-        consoleManager.addConsoles(new IConsole[]{cxfConsole});
-        return cxfConsole;
-     }
-
-    private static void logErrorStreamContents(String message, String className) {
-    	String toolName = className.substring(className.lastIndexOf(".") + 1,  //$NON-NLS-1$
-                className.length());
-
-        if (message != null && message.indexOf(toolName + " Error") != -1) { //$NON-NLS-1$
-          Status toolStatus = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, message);
-          CXFCorePlugin.log(toolStatus);
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
deleted file mode 100644
index 902b143..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.merge.java.facade.JCompilationUnit;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-public final class MergeUtils {
-
-    private MergeUtils() {
-        
-    }
-    
-    private static JMerger getJMerger() {
-        FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
-        URL mergeFileURL = FileLocator.find(CXFCorePlugin.getDefault().getBundle(), new Path(
-                "/jmerger/merge.xml"), null); //$NON-NLS-1$
-        JControlModel controlModel = new JControlModel();
-        controlModel.initialize(facadeHelper, mergeFileURL.toString());
-        JMerger jmerger = new JMerger(controlModel);
-
-        return jmerger;
-    }
-
-    public static void merge(File sourceFile, File targetFile) {
-        JMerger merger = getJMerger();
-
-        FileInputStream sourceInputStream = null;
-        FileInputStream targetInputStream = null;
-        OutputStream targetOutputStream = null;
-        try {
-            // set source
-            sourceInputStream = new FileInputStream(sourceFile);
-            JCompilationUnit inputCompilationUnit = merger
-                    .createCompilationUnitForInputStream(sourceInputStream);
-            merger.setSourceCompilationUnit(inputCompilationUnit);
-
-            // set target
-            targetInputStream = new FileInputStream(targetFile);
-            JCompilationUnit targetCompilationUnit = merger
-                    .createCompilationUnitForInputStream(targetInputStream);
-            merger.setTargetCompilationUnit(targetCompilationUnit);
-
-            // merge source and target
-            merger.merge();
-
-            // write merged contents
-            targetOutputStream = new FileOutputStream(targetFile);
-            byte[] bytes = merger.getTargetCompilationUnit().getContents().getBytes();
-            targetOutputStream.write(bytes, 0, bytes.length);
-        } catch (FileNotFoundException fnfe) {
-            CXFCorePlugin.log(fnfe);
-        } catch (IOException ioe) {
-            CXFCorePlugin.log(ioe);
-        } finally {
-            try {
-                if (sourceInputStream != null) {
-                    sourceInputStream.close();
-                }
-                if (targetInputStream != null) {
-                    targetInputStream.close();
-                }
-                if (targetOutputStream != null) {
-                    targetOutputStream.close();
-                }
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
deleted file mode 100644
index 3e841e5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
-
-@SuppressWarnings("restriction")
-public final class SpringUtils {
-    private static Namespace SPRING_BEANS_NS = Namespace
-            .getNamespace("http://www.springframework.org/schema/beans"); //$NON-NLS-1$
-    private static Namespace XMLNS_XSI = Namespace.getNamespace("xsi", //$NON-NLS-1$
-            "http://www.w3.org/2001/XMLSchema-instance"); //$NON-NLS-1$
-    private static Namespace JAXWS_NS = Namespace.getNamespace("jaxws", "http://cxf.apache.org/jaxws"); //$NON-NLS-1$ //$NON-NLS-2$
-    private static Namespace SOAP_NS = Namespace.getNamespace("soap", "http://cxf.apache.org/bindings/soap"); //$NON-NLS-1$ //$NON-NLS-2$
-
-    private static String DOC_ROOT = "beans"; //$NON-NLS-1$
-
-    private SpringUtils() {
-    }
-
-    public static IFile getBeansFile(IProject project) throws IOException {
-        IFile beansFile = null;
-        IPath webContentPath = J2EEUtils.getWebContentPath(project);
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-
-            IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
-            IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
-            beansFile = webINFFolder.getFile("beans.xml"); //$NON-NLS-1$
-            if (!beansFile.exists()) {
-                try {
-                    IProgressMonitor progressMonitor = new NullProgressMonitor();
-                    beansFile.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-                    createBaseBeansFile(beansFile);
-                } catch (CoreException ce) {
-                    CXFCorePlugin.log(ce);
-                }
-            }
-        }
-        return beansFile;
-    }
-
-    public static IFile getBeansFile(String projectName) throws IOException {
-        return SpringUtils.getBeansFile(FileUtils.getProject(projectName));
-    }
-
-    /**
-     * Returns a handle to the cxf-servlet file in the Web projects WEB-INF
-     * folder.
-     * 
-     * @param project
-     * @return {@link IFile}
-     */
-    public static IFile getCXFServlet(IProject project) throws IOException {
-        IFile cxfServlet = null;
-        IPath webContentPath = J2EEUtils.getWebContentPath(project);
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-
-            IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
-            IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
-            cxfServlet = webINFFolder.getFile("cxf-servlet.xml"); //$NON-NLS-1$
-            if (!cxfServlet.exists()) {
-                try {
-                    IProgressMonitor progressMonitor = new NullProgressMonitor();
-
-                    cxfServlet.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-                    createBaseCXFServletFile(cxfServlet);
-                } catch (CoreException ce) {
-                    CXFCorePlugin.log(ce.getStatus());
-                }
-            }
-        }
-        return cxfServlet;
-    }
-
-    public static IFile getCXFServlet(String projectName) throws IOException {
-        return SpringUtils.getCXFServlet(FileUtils.getProject(projectName));
-    }
-
-    private static void createBaseCXFServletFile(IFile cxfServlet)  throws IOException {
-        Element beans = new Element(DOC_ROOT);
-        beans.setNamespace(SPRING_BEANS_NS);
-        beans.addNamespaceDeclaration(XMLNS_XSI);
-        beans.addNamespaceDeclaration(JAXWS_NS);
-        beans.addNamespaceDeclaration(SOAP_NS);
-
-        Attribute schemaLocation = new Attribute(
-                "schemaLocation", //$NON-NLS-1$
-                "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
-        beans.setAttribute(schemaLocation);
-
-        writeConfig(new Document(beans), cxfServlet);
-    }
-
-    private static void createBaseBeansFile(IFile beansFile) throws IOException {
-        Element beans = new Element(DOC_ROOT);
-        beans.setNamespace(SPRING_BEANS_NS);
-        beans.addNamespaceDeclaration(XMLNS_XSI);
-        beans.addNamespaceDeclaration(JAXWS_NS);
-
-        Attribute schemaLocation = new Attribute(
-                "schemaLocation", //$NON-NLS-1$
-                "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
-        beans.setAttribute(schemaLocation);
-
-        Element importCXFResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFResource.setAttribute("resource", "classpath:META-INF/cxf/cxf.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        Element importCXFSoapExtensionResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFSoapExtensionResource.setAttribute("resource", //$NON-NLS-1$
-                "classpath:META-INF/cxf/cxf-extension-soap.xml"); //$NON-NLS-1$
-
-        Element importCXFServeltResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFServeltResource.setAttribute("resource", "classpath:META-INF/cxf/cxf-servlet.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        beans.addContent(importCXFResource);
-        beans.addContent(importCXFSoapExtensionResource);
-        beans.addContent(importCXFServeltResource);
-
-        writeConfig(new Document(beans), beansFile);
-    }
-
-    public static boolean isSpringBeansFile(IFile springBeansFile) throws IOException {
-        FileInputStream springBeansInputStream = new FileInputStream(springBeansFile.getLocation().toFile());
-        if (springBeansInputStream.available() > 0) {
-            SAXBuilder builder = new SAXBuilder();
-            try {
-                Document doc = builder.build(springBeansInputStream);
-                Element root = doc.getRootElement();
-                if (root.getName().equals(DOC_ROOT) && root.getNamespace().equals(SPRING_BEANS_NS)) {
-                    return true;
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-               springBeansInputStream.close();
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static boolean isBeanDefined(CXFDataModel cxfDataModel, String projectName, String elementName,
-            Namespace namespace, String id) throws IOException {
-        IFile springConfigFile = null;
-        
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(projectName);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(projectName);
-        }
-
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-
-                List<Element> endpoints = beans.getChildren(elementName, namespace);
-                for (Element element : endpoints) {
-                    if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
-                        Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
-                        if (idAttribute.getValue().equals(id)) {
-                            return true;
-                        }
-                    }                    
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-               springConfigInputSteam.close();
-            }
-        }
-        return false;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static String getEndpointAddress(IProject project, String jaxwsEndpointId) throws IOException {
-        IFile springConfigFile = null;
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(project);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(project);
-        }
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-                List<Element> endpoints = beans.getChildren("endpoint", JAXWS_NS); //$NON-NLS-1$
-                for (Element element : endpoints) {
-                    if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
-                        Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
-                        if (idAttribute.getValue().equals(jaxwsEndpointId)) {
-                           return element.getAttribute("address").getValue(); //$NON-NLS-1$
-                        }
-                    }                    
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-                springConfigInputSteam.close();
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void createConfigurationFromWSDL(WSDL2JavaDataModel model) throws IOException {
-        String targetNamespace = model.getTargetNamespace();
-        String packageName = model.getIncludedNamespaces().get(targetNamespace);
-
-        Definition definition = model.getWsdlDefinition();
-        Map servicesMap = definition.getServices();
-        Set<Map.Entry> servicesSet = servicesMap.entrySet();
-        for (Map.Entry serviceEntry : servicesSet) {
-            Service service = (Service) serviceEntry.getValue();
-            model.setServiceName(service.getQName().getLocalPart());
-            Map portsMap = service.getPorts();
-            Set<Map.Entry> portsSet = portsMap.entrySet();
-            for (Map.Entry portEntry : portsSet) {
-                Port port = (Port) portEntry.getValue();
-                model.setEndpointName(port.getName());
-                PortType portType = port.getBinding().getPortType();
-                QName qName = portType.getQName();
-                String portTypeName = qName.getLocalPart();
-                String fullyQualifiedClassName = packageName + "." + //$NON-NLS-1$
-                	convertPortTypeName(portTypeName) + "Impl"; //$NON-NLS-1$
-                model.setFullyQualifiedJavaClassName(fullyQualifiedClassName);
-                SpringUtils.createJAXWSEndpoint(model);
-             }
-         }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void loadSpringConfigInformationFromWSDL(CXFDataModel model) {
-        IFile wsdlFile = WSDLUtils.getWSDLFolder(model.getProjectName()).getFile(model.getWsdlFileName());
-        if (wsdlFile.exists()) {
-            try {
-                model.setWsdlURL(wsdlFile.getLocationURI().toURL());
-                Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
-                Map servicesMap = definition.getServices();
-                Set<Map.Entry> servicesSet = servicesMap.entrySet();
-                for (Map.Entry serviceEntry : servicesSet) {
-                    Service service = (Service) serviceEntry.getValue();
-                    model.setServiceName(service.getQName().getLocalPart());
-                    Map portsMap = service.getPorts();
-                    Set<Map.Entry> portsSet = portsMap.entrySet();
-                    for (Map.Entry portEntry : portsSet) {
-                        Port port = (Port) portEntry.getValue();
-                        model.setEndpointName(port.getName());
-                     }
-                }
-                model.setWsdlDefinition(definition);
-            } catch (MalformedURLException murle) {
-               CXFCorePlugin.log(murle);
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-
-    private static String convertPortTypeName(String portTypeName) {
-        String[] segments = portTypeName.split("[\\-\\.\\:\\_\\u00b7\\u0387\\u06dd\\u06de]");
-
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String segment : segments) {
-            if (segment.length() == 0) {
-                continue;
-            }
-            char firstCharacter = segment.charAt(0);
-            if (!Character.isDigit(firstCharacter) && Character.isLowerCase(firstCharacter)) {
-                segment = segment.substring(0, 1).toUpperCase() + segment.substring(1);
-            }
-
-            for (int i = 1; i < segment.length(); i++) {
-                char currentChar = segment.charAt(i);
-                char precedingChar = segment.charAt(i - 1);
-                if (Character.isLetter(currentChar) && Character.isDigit(precedingChar)
-                        && Character.isLowerCase(currentChar)) {
-                    segment = segment.substring(0, i) + segment.substring(i, i + 1).toUpperCase()
-                            + segment.substring(i + 1, segment.length());
-                }
-            }
-            stringBuilder.append(segment);
-        }
-        return stringBuilder.toString();
-    }
-
-    public static void createJAXWSEndpoint(CXFDataModel model) throws IOException {
-        String projectName = model.getProjectName();
-
-        IFile springConfigFile = null;
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(projectName);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(projectName);
-        }
-
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-
-                Element jaxwsEndpoint = new Element("endpoint", JAXWS_NS); //$NON-NLS-1$
-
-                String id = getJAXWSEndpointID(model);
-                model.setConfigId(id);
-                jaxwsEndpoint.setAttribute("id", id); //$NON-NLS-1$
-
-                jaxwsEndpoint.setAttribute("implementor", model.getFullyQualifiedJavaClassName()); //$NON-NLS-1$
-
-                if (model.getConfigWsdlLocation() != null) {
-                    jaxwsEndpoint.setAttribute("wsdlLocation", model.getConfigWsdlLocation()); //$NON-NLS-1$
-                    
-                    if (model.getEndpointName() != null && model.getServiceName() != null) {
-                        jaxwsEndpoint.setAttribute("endpointName", "tns:" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
-                        jaxwsEndpoint.setAttribute("serviceName", "tns:" + model.getServiceName()); //$NON-NLS-1$ //$NON-NLS-2$
-                    
-                        Namespace XMLNS_TNS = Namespace.getNamespace("tns", model.getTargetNamespace()); //$NON-NLS-1$
-                        jaxwsEndpoint.addNamespaceDeclaration(XMLNS_TNS);
-                    }
-                }
-                
-                if (model.getEndpointName() != null) {
-                    jaxwsEndpoint.setAttribute("address", "/" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
-                } else {
-                    jaxwsEndpoint.setAttribute("address", "/" + id); //$NON-NLS-1$ //$NON-NLS-2$
-                }
-                
-
-                Element jaxwsFeatures = new Element("features", JAXWS_NS); //$NON-NLS-1$
-                Element bean = new Element("bean", SPRING_BEANS_NS); //$NON-NLS-1$
-                bean.setAttribute("class", "org.apache.cxf.feature.LoggingFeature"); //$NON-NLS-1$ //$NON-NLS-2$
-                jaxwsFeatures.addContent(bean);
-                jaxwsEndpoint.addContent(jaxwsFeatures);
-
-                if (!isBeanDefined(model, projectName, "endpoint", JAXWS_NS, id)) { //$NON-NLS-1$
-                    beans.addContent(jaxwsEndpoint);
-
-                    writeConfig(doc, springConfigFile);
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-                springConfigInputSteam.close();
-            }
-        }
-    }
-
-    private static String getJAXWSEndpointID(CXFDataModel model) {
-        String implementor = model.getFullyQualifiedJavaClassName();
-        if (implementor.indexOf(".") != -1) { //$NON-NLS-1$
-            implementor = implementor.substring(implementor.lastIndexOf(".") + 1, implementor.length());
-        }
-        if (!implementor.startsWith("Impl") && implementor.indexOf("Impl") != -1) {
-            implementor = implementor.substring(0, implementor.indexOf("Impl")).toLowerCase(); //$NON-NLS-1$;
-        } else {
-            implementor = implementor.toLowerCase();
-        }
-        return implementor;
-    }
-    
-    private static void writeConfig(Document document, IFile springConfigFile) throws IOException {
-        OutputStream outputStream = new FileOutputStream(springConfigFile.getLocation().toFile());
-        try {
-            XMLOutputter outputter = new XMLOutputter();
-            outputter.output(document, outputStream);
-            springConfigFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
-            FileUtils.formatXMLFile(springConfigFile);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        } finally {
-            outputStream.close(); 
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
deleted file mode 100644
index 8617355..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.facet;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.SessionConfig;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCoreMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * Adds the CXF classpath container to the project.
- * <p>
- * Also sets up the web projects application deployment descriptor (web.xml file)
- * to use cxf-servlet or the Spring Application context (WEB-INF/beans.xml) for 
- * endpoint configuration. Depends on a setting in the CXF preferences. 
- * 
- */
-public class CXFFacetInstallDelegate implements IDelegate {
-
-    public void execute(final IProject project, IProjectFacetVersion fv, Object config,
-            IProgressMonitor monitor) throws CoreException {
-
-        if (CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation().equals("")) { //$NON-NLS-1$
-            throw new CoreException(new Status(Status.ERROR, CXFCorePlugin.PLUGIN_ID,
-                    CXFCoreMessages.CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET));
-        }
-
-        IPath cxfLibPath = new Path(CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation());
-        if (!cxfLibPath.hasTrailingSeparator()) {
-            cxfLibPath = cxfLibPath.addTrailingSeparator();
-        }
-        cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
-        IClasspathAttribute jstComponentDependency = 
-            JavaCore.newClasspathAttribute("org.eclipse.jst.component.dependency", "/WEB-INF/lib"); //$NON-NLS-1$
-        IClasspathEntry cxfClasspathContainer = 
-            JavaCore.newContainerEntry(new Path("org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER"), //$NON-NLS-1$
-            new IAccessRule[0],
-            CXFCorePlugin.getDefault().getJava2WSContext().isExportCXFClasspathContainer() 
-            ? new IClasspathAttribute[]{jstComponentDependency} : new IClasspathAttribute[]{},
-            true);
-        
-        JDTUtils.addToClasspath(JavaCore.create(project), cxfClasspathContainer);
-        
-        // Add CXF Servlet, Servlet Mapping and Session Config to web.xml
-        final IModelProvider provider = ModelProviderManager.getModelProvider(project);
-        provider.modify(new Runnable() {
-            public void run() {
-                Object modelProvider = provider.getModelObject();
-                boolean useSpringAppContext = CXFCorePlugin.getDefault().getJava2WSContext()
-                        .isUseSpringApplicationContext();
-                // jst.web 2.5
-                if (modelProvider instanceof org.eclipse.jst.javaee.web.WebApp) {
-                    org.eclipse.jst.javaee.web.WebApp javaeeWebApp = 
-                        (org.eclipse.jst.javaee.web.WebApp) modelProvider;
-                    addCXFJSTWEB25Servlet(project, javaeeWebApp);
-                    if (useSpringAppContext) {
-                        addSpringApplicationContextWeb25(project, javaeeWebApp);
-                    }
-                }
-                // jst.web 2.4
-                if (modelProvider instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
-                    org.eclipse.jst.j2ee.webapplication.WebApp webApp = 
-                        (org.eclipse.jst.j2ee.webapplication.WebApp) modelProvider;
-                    addCXFJSTWEB24Servlet(project, webApp);
-                    if (useSpringAppContext) {
-                        addSpringApplicationContextWeb24(project, webApp);
-                    }
-                }
-            }
-        }, null);
-
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isAnnotationProcessingEnabled()) {
-            AptConfig.setEnabled(JavaCore.create(project), true);    
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addSpringApplicationContextWeb24(IProject webProject,
-            org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
-        List contextParams = webapp.getContextParams();
-        for (int i = 0; i < contextParams.size(); i++) {
-            ContextParam contextParam = (ContextParam) contextParams.get(i);
-            if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
-                return;
-            }
-        }
-        // org.eclipse.jst.javaee.core.ParamValue
-        List listeners = webapp.getListeners();
-        for (int i = 0; i < listeners.size(); i++) {
-            Listener contextLoaderListener = (Listener) listeners.get(i);
-            if (contextLoaderListener.getListenerClass().getName().equals(
-                    "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        CommonFactory commonFactory = CommonFactory.eINSTANCE;
-        JavaRefFactory javaRefFactory = JavaRefFactory.eINSTANCE;
-
-        org.eclipse.jst.j2ee.common.ParamValue configLocationParam = commonFactory.createParamValue();
-        configLocationParam.setName("contextConfigLocation"); //$NON-NLS-1$
-        configLocationParam.setValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
-        webapp.getContextParams().add(configLocationParam);
-
-        Listener contextLoaderListener = commonFactory.createListener();
-        JavaClass javaClass = javaRefFactory.createJavaClass();
-        javaClass.setName("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
-        contextLoaderListener.setListenerClass(javaClass);
-
-        webapp.getListeners().add(contextLoaderListener);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addSpringApplicationContextWeb25(IProject webProject,
-            org.eclipse.jst.javaee.web.WebApp webapp) {
-        List contextParams = webapp.getContextParams();
-        for (int i = 0; i < contextParams.size(); i++) {
-            ParamValue contextParam = (ParamValue) contextParams.get(i);
-            if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        List listeners = webapp.getListeners();
-        for (int i = 0; i < listeners.size(); i++) {
-            org.eclipse.jst.javaee.core.Listener contextLoaderListener = 
-                (org.eclipse.jst.javaee.core.Listener) listeners.get(i);
-            if (contextLoaderListener.getListenerClass().equals(
-                    "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        JavaeeFactory javaeeFactory = JavaeeFactory.eINSTANCE;
-
-        ParamValue configLocationParam = javaeeFactory.createParamValue();
-        configLocationParam.setParamName("contextConfigLocation"); //$NON-NLS-1$
-        configLocationParam.setParamValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
-        webapp.getContextParams().add(configLocationParam);
-
-        org.eclipse.jst.javaee.core.Listener contextLoaderListener = javaeeFactory.createListener();
-        contextLoaderListener.setListenerClass("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
-
-        webapp.getListeners().add(contextLoaderListener);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCXFJSTWEB24Servlet(IProject webProject, org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
-        List servlets = webapp.getServlets();
-        for (int i = 0; i < servlets.size(); i++) {
-        	org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) servlets.get(i);
-            if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
-        org.eclipse.jst.j2ee.webapplication.Servlet cxfServlet = factory.createServlet();
-        ServletType servletType = factory.createServletType();
-        cxfServlet.setWebType(servletType);
-        cxfServlet.setServletName("cxf"); //$NON-NLS-1$
-        servletType.setClassName("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
-        cxfServlet.setDisplayName("cxf"); //$NON-NLS-1$
-        cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
-        webapp.getServlets().add(cxfServlet);
-
-        org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping = factory.createServletMapping();
-        servletMapping.setServlet(cxfServlet);
-        servletMapping.setUrlPattern("/services/*"); //$NON-NLS-1$
-        webapp.getServletMappings().add(servletMapping);
-
-        org.eclipse.jst.j2ee.webapplication.SessionConfig sessionConfig = factory.createSessionConfig();
-        sessionConfig.setSessionTimeout(60);
-        webapp.setSessionConfig(sessionConfig);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCXFJSTWEB25Servlet(IProject webProject, org.eclipse.jst.javaee.web.WebApp webapp) {
-        List servlets = webapp.getServlets();
-        for (int i = 0; i < servlets.size(); i++) {
-            Servlet servlet = (Servlet) servlets.get(i);
-            if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        // CXF Servlet
-        WebFactory factory = WebFactory.eINSTANCE;
-        Servlet cxfServlet = factory.createServlet();
-
-        cxfServlet.setServletName("cxf"); //$NON-NLS-1$
-
-        DisplayName cxfServletDisplayName = JavaeeFactory.eINSTANCE.createDisplayName();
-        cxfServletDisplayName.setValue("cxf"); //$NON-NLS-1$
-        cxfServlet.getDisplayNames().add(cxfServletDisplayName);
-
-        Description cxfServletDescription = JavaeeFactory.eINSTANCE.createDescription();
-        cxfServletDescription.setValue("Apache CXF Endpoint"); //$NON-NLS-1$
-        cxfServlet.getDescriptions().add(cxfServletDescription);
-
-        cxfServlet.setServletClass("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
-
-        cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
-        webapp.getServlets().add(cxfServlet);
-
-        ServletMapping cxfServletMapping = factory.createServletMapping();
-        cxfServletMapping.setServletName("cxf"); //$NON-NLS-1$
-        UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
-        url.setValue("/services/*"); //$NON-NLS-1$
-        cxfServletMapping.getUrlPatterns().add(url);
-        webapp.getServletMappings().add(cxfServletMapping);
-
-        SessionConfig sessionConfig = factory.createSessionConfig();
-        sessionConfig.setSessionTimeout(new BigInteger("60")); //$NON-NLS-1$
-        webapp.getSessionConfigs().add(sessionConfig);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java
deleted file mode 100644
index 41d409c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class CXFFacetUninstallDelegate implements IDelegate {
-
-    public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor)
-            throws CoreException {
-  
-        //TODO Implement
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.project b/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
deleted file mode 100644
index 12dd1e0..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.creation.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c4e8e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:54 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 7b310e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.creation.core
-Bundle-Version: 0.4.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.core.commands;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.3.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.100,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)"
-Bundle-ActivationPolicy: lazy
-Ant-Version: Apache Ant 1.7.0
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html b/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
deleted file mode 100644
index 5b6a736..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
deleted file mode 100644
index 9cd8c83..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Creation Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
deleted file mode 100644
index c08c96e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CXFCreationCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages"; //$NON-NLS-1$
-    public static String WSDL2JAVA_PROJECT_SELECTION_ERROR;
-    public static String WSDL2JAVA_VALID_PORTTYPE_MESSAGE;
-    
-    public static String JAVA2WS_SERVICE_IMPL_NOT_FOUND;
-    public static String JAVA2WS_SERVICE_IMPL_NOT_BINARY;
-
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, CXFCreationCoreMessages.class);
-    }
-
-    private CXFCreationCoreMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
deleted file mode 100644
index d7ac111..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: 
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-WSDL2JAVA_PROJECT_SELECTION_ERROR=A possible conflict has been detected between project selections.\n\n The current configuration will result in code being generated into the "{0}" project.\n\nTo change the configuration click Cancel and then select the "Service project:" link in the "Configuration:" section in the Web Service wizard.\n\nClick Ok to continue with the current configuration.
-
-WSDL2JAVA_VALID_PORTTYPE_MESSAGE=The WSDL document must have a valid portType element
-
-JAVA2WS_SERVICE_IMPL_NOT_FOUND=The Service Implementation "{0}" cannot be loaded from the "{1}" project. Please check that the project contains the class and that it is visible on the projects "Java Build Path".
-JAVA2WS_SERVICE_IMPL_NOT_BINARY=Binary class files not supported. The Service Implementation must be a Java Source type.
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
deleted file mode 100644
index e339e78..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- */
-public class CXFCreationCorePlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.creation.core"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFCreationCorePlugin plugin;
-
-    /**
-     * The constructor
-     */
-    public CXFCreationCorePlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFCreationCorePlugin getDefault() {
-        return plugin;
-    }
-
-    public static void logMessage(int severity, String message) {
-        CXFCreationCorePlugin.log(new Status(severity, CXFCreationCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFCreationCorePlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFCreationCorePlugin.log(new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, 
-            exception.getLocalizedMessage(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
deleted file mode 100644
index 5891812..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-@SuppressWarnings("restriction")
-public class CXFDeployCommand extends AbstractDataModelOperation {
-    private static final String CXF_SERVLET = "org.apache.cxf.transport.servlet.CXFServlet"; //$NON-NLS-1$
-    private IProject project;
-    private IWebService webService;
-    private CXFDataModel model;
-    
-    public CXFDeployCommand(String projectName, IWebService webService) {
-        this.project = FileUtils.getProject(projectName);
-        this.webService = webService;
-    }
-    
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        
-        try {
-            WebServiceInfo webServiceInfo = webService.getWebServiceInfo();
-            
-            String serverInstanceId = webServiceInfo.getServerInstanceId();
-            String serverFactoryId = webServiceInfo.getServerFactoryId();
-            if (serverInstanceId != null) {
-                IServer server = ServerCore.findServer(serverInstanceId);
-                String webCobComponentURL = ServerUtils.getEncodedWebComponentURL(project, serverFactoryId,
-                        server);
-                
-                String urlPattern = ""; //$NON-NLS-1$
-                
-                IModelProvider provider = ModelProviderManager.getModelProvider(project);
-                Object modelProvider = provider.getModelObject();
-                // jst.web 2.5
-                if (modelProvider instanceof org.eclipse.jst.javaee.web.WebApp) {
-                    org.eclipse.jst.javaee.web.WebApp javaeeWebApp = 
-                        (org.eclipse.jst.javaee.web.WebApp) modelProvider;
-                    
-                    urlPattern = getURLPattern(javaeeWebApp);
-                }
-                
-                // jst.web 2.4
-                if (modelProvider instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
-                    org.eclipse.jst.j2ee.webapplication.WebApp webApp = 
-                        (org.eclipse.jst.j2ee.webapplication.WebApp) modelProvider;
-                    
-                    urlPattern = getURLPattern(webApp);
-                }
-                
-                urlPattern = urlPattern.substring(0, urlPattern.lastIndexOf("/")); //$NON-NLS-1$
-                String jaxwsEndpointAddress = SpringUtils.getEndpointAddress(project, 
-                        model.getConfigId());
-                
-                String wsdlAddress = webCobComponentURL + urlPattern + jaxwsEndpointAddress;
-                String wsdlURL = wsdlAddress + "?wsdl"; //$NON-NLS-1$
-                
-                webService.getWebServiceInfo().setWsdlURL(wsdlURL);
-                
-                Definition definition = model.getWsdlDefinition();
-
-                ExtensibilityElement extensibilityElement = WSDLUtils.getEndpointAddress(definition);
-                if (extensibilityElement != null) {
-                    if (extensibilityElement instanceof SOAPAddress) {
-                        ((SOAPAddress) extensibilityElement).setLocationURI(wsdlAddress);
-                    }
-                    if (extensibilityElement instanceof SOAP12Address) {
-                        ((SOAP12Address) extensibilityElement).setLocationURI(wsdlAddress);
-                    }
-
-                    WSDLUtils.writeWSDL(model.getWsdlURL(), definition);
-                }              
-            }
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-        return status;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private String getURLPattern(org.eclipse.jst.javaee.web.WebApp javaeeWebApp) {
-        List<org.eclipse.jst.javaee.web.Servlet> servlets = javaeeWebApp.getServlets();
-        for (org.eclipse.jst.javaee.web.Servlet servlet : servlets) {
-            if (servlet.getServletClass().equals(CXF_SERVLET)) {
-                List<org.eclipse.jst.javaee.web.ServletMapping> servletMappings = 
-                    javaeeWebApp.getServletMappings();
-                for (org.eclipse.jst.javaee.web.ServletMapping servletMapping : servletMappings) {
-                    if (servletMapping.getServletName().equals(servlet.getServletName())) {
-                        List<org.eclipse.jst.javaee.core.UrlPatternType> urlPatterns = 
-                            servletMapping.getUrlPatterns();
-                        if (urlPatterns.size() > 0) {
-                            String value = ((org.eclipse.jst.javaee.core.UrlPatternType)
-                                    urlPatterns.get(0)).getValue();
-                            return value;
-                        }
-                    }
-                }
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    @SuppressWarnings("unchecked")
-    private String getURLPattern(org.eclipse.jst.j2ee.webapplication.WebApp webApp) {
-        List<org.eclipse.jst.j2ee.webapplication.Servlet> servlets = webApp.getServlets();
-        for (org.eclipse.jst.j2ee.webapplication.Servlet servlet : servlets) {
-            if (servlet.getServletClass().getJavaName().equals(CXF_SERVLET)) {
-                List<org.eclipse.jst.j2ee.webapplication.ServletMapping> servletMappings = 
-                    webApp.getServletMappings();
-                for (org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping : servletMappings) {
-                    if (servletMapping.getServlet().getServletName().equals(servlet.getServletName())) {
-                        return servletMapping.getUrlPattern();
-                    }
-                }
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    public void setCXFDataModel(CXFDataModel model) {
-        this.model = model;
-    }
-    
-    public String getClientComponentType() {
-        return "template.cxf.core"; //$NON-NLS-1$
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
deleted file mode 100644
index cac3055..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class JAXWSAnnotateJavaCommand extends AbstractDataModelOperation {
-    private int numberOfChanges = 0;
-
-    private Java2WSDataModel model;
-    private IType javaClassType;
-    private IType javaInterfaceType;
-    
-    public JAXWSAnnotateJavaCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            if (model.isUseServiceEndpointInterface()) {
-                annotateInterface(monitor);
-
-                if (model.getFullyQualifiedJavaClassName() != null) {
-                    annotateSEIClass(monitor);
-                }
-            } else if (model.getFullyQualifiedJavaClassName() != null) {
-                annotateClass(monitor);
-            }
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (InvocationTargetException ite) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } catch (InterruptedException ie) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } 
-        return status;
-    }
-    
-    private void annotateInterface(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaInterfaceType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaInterfaceName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotating Interface", 
-                (IFile)javaInterfaceType.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-
-        CXFModelUtils.getWebServiceAnnotationChange(javaInterfaceType, model, textFileChange);
-
-        IMethod[] typeMethods = JDTUtils.getPublicMethods(javaInterfaceType);
-        for (int i = 0; i < typeMethods.length; i++) {
-            IMethod method = typeMethods[i];
-            Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
-            if (methodAnnotationMap == null) {
-                continue;
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
-                CXFModelUtils.getWebMethodAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
-                CXFModelUtils.getRequestWrapperAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
-                CXFModelUtils.getResponseWrapperAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
-                List<SingleVariableDeclaration> parameters = AnnotationUtils.getSingleVariableDeclarations(method);
-                for (SingleVariableDeclaration parameter : parameters) {
-                    CXFModelUtils.getWebParamAnnotationChange(javaInterfaceType, method, 
-                    		(ILocalVariable) parameter.resolveBinding().getJavaElement(), textFileChange);
-                }
-            } 
-        }
-        
-        CXFModelUtils.getImportsChange(javaInterfaceType.getCompilationUnit(), model, 
-        		textFileChange, false);
-        
-        executeChange(monitor, textFileChange);
-    }
-    
-    private void annotateClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaClassName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotating Class", 
-                (IFile) javaClassType.getCompilationUnit().getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-        
-        CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-
-        IMethod[] typeMethods = JDTUtils.getPublicMethods(javaClassType);
-        for (int i = 0; i < typeMethods.length; i++) {
-            IMethod method = typeMethods[i];
-            Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
-                CXFModelUtils.getWebMethodAnnotationChange(javaClassType, method, textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
-                CXFModelUtils.getRequestWrapperAnnotationChange(javaClassType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
-                CXFModelUtils.getResponseWrapperAnnotationChange(javaClassType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
-            	List<SingleVariableDeclaration> parameters = AnnotationUtils.getSingleVariableDeclarations(method);
-            	for (SingleVariableDeclaration parameter : parameters) {
-                    CXFModelUtils.getWebParamAnnotationChange(javaClassType, method, 
-                    		(ILocalVariable) parameter.resolveBinding().getJavaElement(), textFileChange);
-                }
-            } 
-        }
-        
-        CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model, 
-        		textFileChange, false);
-        
-        executeChange(monitor, textFileChange);
-    }
-
-    private void annotateSEIClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaClassName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotation Changes",
-                (IFile)javaClassType.getCompilationUnit().getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-
-        CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-        
-        CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model, 
-        		textFileChange, true);
-
-        executeChange(monitor, textFileChange);
-    }
-    
-    private void executeChange(IProgressMonitor monitor, Change change) {
-        if (change == null) {
-            return;
-        }
-
-        IUndoManager manager = RefactoringCore.getUndoManager();
-        boolean successful = false;
-        Change undoChange = null;
-        try {
-            change.initializeValidationData(monitor);
-            RefactoringStatus valid = change.isValid(monitor);
-            if (valid.isOK()) {
-                manager.aboutToPerformChange(change);
-                undoChange = change.perform(monitor);
-                successful = true;
-                numberOfChanges++;
-            }
-        } catch (CoreException ce) {
-            CXFCreationCorePlugin.log(ce.getStatus());
-        } finally {
-            manager.changePerformed(change, successful);
-        }
-        if (undoChange != null) {
-            undoChange.initializeValidationData(monitor);
-            manager.addUndo(undoChange.getName(), undoChange);
-        }
-    }
-    
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        
-        IUndoManager manager = RefactoringCore.getUndoManager();
-
-        if (manager.anythingToUndo()) {
-            try {
-                for (int i = 0; i < numberOfChanges; i++) {
-                    manager.performUndo(null, monitor);
-                }
-            } catch (CoreException ce) {
-                status = ce.getStatus();
-                CXFCreationCorePlugin.log(status);
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
deleted file mode 100644
index 396bb79..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.java2ws.JavaToWS</code> or the
- * <code>org.apache.cxf.tools.java2wsdl.JavaToWSDL</code> command depending on the version
- * of CXF used.
- *
- */
-public class Java2WSCommand extends AbstractDataModelOperation {
-    private static String JAVA2WSDL_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2wsdl.JavaToWSDL"; //$NON-NLS-1$
-    private static String JAVA2WS_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2ws.JavaToWS"; //$NON-NLS-1$
-    private String CXF_TOOL_CLASS_NAME;
-
-    private Java2WSDataModel model;
-    private String projectName;
-
-    private JavaResourceChangeListener javaResourceChangeListener;
-    private WebContentChangeListener webContentChangeListener;
-
-    public Java2WSCommand(Java2WSDataModel model) {
-        this.model = model;
-        projectName = model.getProjectName();
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        IType startingPoint = JDTUtils.getType(projectName, model.getJavaStartingPoint());
-        javaResourceChangeListener = new JavaResourceChangeListener(JDTUtils
-                .getJavaProjectSourceDirectoryPath(startingPoint));
-        webContentChangeListener = new WebContentChangeListener(projectName);
-
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            CXF_TOOL_CLASS_NAME = JAVA2WS_TOOL_CLASS_NAME;
-        } else {
-            CXF_TOOL_CLASS_NAME = JAVA2WSDL_TOOL_CLASS_NAME;
-        }
-
-        String[] progArgs = CommandLineUtils.getJava2WSProgramArguments(model);
-
-        try {
-            IProject project = FileUtils.getProject(projectName);
-            IJavaProject javaProject = JavaCore.create(project);
-            LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyJ2WFilesFromTmp(model);
-
-            if (model.isGenerateWSDL()) {
-            	SpringUtils.loadSpringConfigInformationFromWSDL((model));
-            }
-
-            if (isImplementationSelected() || isGenerateServer()) {
-                SpringUtils.createJAXWSEndpoint(model);
-            }
-
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } finally {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-            FileUtils.refreshProject(projectName, monitor);
-        }
-
-        return status;
-    }
-
-	private boolean isImplementationSelected() {
-        return (model.getFullyQualifiedJavaClassName() != null &&
-                model.getFullyQualifiedJavaClassName().trim().length() > 0);
-    }
-
-    private boolean isGenerateServer() {
-		if (model.isGenerateServer()) {
-			model.setFullyQualifiedJavaClassName(model.getFullyQualifiedJavaInterfaceName() + "Impl");
-			return true;
-		}
-		return false;
-	}
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-        Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        model.setGenerateClient(context.isGenerateClient());
-        model.setGenerateServer(context.isGenerateServer());
-        model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
-        model.setGenerateWSDL(context.isGenerateWSDL());
-        model.setSoap12Binding(context.isSoap12Binding());
-        model.setGenerateXSDImports(context.isGenerateXSDImports());
-        return status;
-    }
-
-    public CXFDataModel getCXFDataModel() {
-        return model;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
deleted file mode 100644
index 9a7c2b3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Java2WSDefaultingCommand extends AbstractDataModelOperation {
-    private Java2WSDataModel model;
-
-    public Java2WSDefaultingCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-            model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-            model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-
-            IType startingPointType = getJavaStartingPointType();
-            model.setUseServiceEndpointInterface(startingPointType.isInterface());
-            model.setExtractInterface(false);
-
-            String packageName = startingPointType.getPackageFragment().getElementName();
-            model.setTargetNamespace(JDTUtils.getTargetNamespaceFromPackageName(packageName));
-
-            model.setAnnotationProcessingEnabled(context.isAnnotationProcessingEnabled());
-            model.setGenerateWebMethodAnnotation(context.isGenerateWebMethodAnnotation());
-            model.setGenerateWebParamAnnotation(context.isGenerateWebParamAnnotation());
-            model.setGenerateRequestWrapperAnnotation(context.isGenerateRequestWrapperAnnotation());
-            model.setGenerateResponseWrapperAnnotation(context.isGenerateResponseWrapperAnnotation());
-            model.setAnnotationMap(CXFModelUtils.getAnnotationMap(model));
-            model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-
-            model.setGenerateXSDImports(context.isGenerateXSDImports());
-            model.setDatabinding(context.getDatabinding());
-            model.setFrontend(context.getFrontend());
-            model.setGenerateClient(context.isGenerateClient());
-            model.setGenerateServer(context.isGenerateServer());
-            model.setSoap12Binding(context.isSoap12Binding());
-            model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
-            model.setGenerateWSDL(context.isGenerateWSDL());
-            model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
-            model.setVerbose(context.isVerbose());
-
-            String className = getClassName(model.getProjectName(), model.getJavaStartingPoint());
-            model.setWsdlFileName(className.toLowerCase() + WSDLUtils.WSDL_FILE_EXTENSION);
-        } catch (JavaModelException jme) {
-            status = jme.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-        return status;
-    }
-
-    public CXFDataModel getJava2WSDataModel() {
-        return model;
-    }
-
-    public IType getJavaStartingPointType() {
-        String projectName = model.getProjectName();
-        String javaStartingPoint = model.getJavaStartingPoint();
-
-        IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-        IType startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
-        return startingPointType;
-    }
-
-    public String getClassName(String projectName, String fullyQualifiedClassName) {
-        return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName)
-                .getElementName();
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
deleted file mode 100644
index 8a55198..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEICommand extends AbstractDataModelOperation {
-    private Change undoExtractInterfaceChange;
-
-    private Java2WSDataModel model;
-    
-    private  IType startingPointType;
-
-    public Java2WSSelectSEICommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            String projectName = model.getProjectName();
-            String javaStartingPoint = model.getJavaStartingPoint();
-
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
-            
-            if (startingPointType.isInterface()) {
-                model.setFullyQualifiedJavaInterfaceName(startingPointType.getFullyQualifiedName());
-            } else if (startingPointType.isClass()) {
-                model.setFullyQualifiedJavaClassName(startingPointType.getFullyQualifiedName());
-                if (model.isUseServiceEndpointInterface() && model.isExtractInterface()) {
-                    extractInterface(startingPointType, monitor);
-                }
-            }
-        } catch (JavaModelException jme) {
-            status = jme.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-
-        return status;
-    }
-
-    private void extractInterface(IType type, IProgressMonitor monitor) {
-        try {
-            final ExtractInterfaceProcessor extractInterfaceProcessor = new ExtractInterfaceProcessor(type,
-                    JavaPreferencesSettings.getCodeGenerationSettings(type.getJavaProject()));
-            Refactoring extractInterfaceRefactoring = new ProcessorBasedRefactoring(extractInterfaceProcessor) {
-
-                @Override
-                public RefactoringProcessor getProcessor() {
-                    return extractInterfaceProcessor;
-                }
-            };
-            String typeName = model.getServiceEndpointInterfaceName();
-            if (typeName.indexOf(".") != -1) {
-                typeName = typeName.substring(typeName.lastIndexOf(".") + 1, typeName.length());
-            }
-            extractInterfaceProcessor.setTypeName(typeName);
-            extractInterfaceProcessor.setReplace(false);
-            
-            Set<IMethod> methods = model.getMethodMap().keySet();
-            extractInterfaceProcessor.setExtractedMembers(methods.toArray(new IMember[methods.size()]));
-            extractInterfaceProcessor.setAbstract(false);
-            extractInterfaceProcessor.setPublic(true);
-            extractInterfaceProcessor.setComments(false);
-            extractInterfaceProcessor.setInstanceOf(false);
-
-            CreateChangeOperation createChangeOperation = new CreateChangeOperation(
-                    new CheckConditionsOperation(extractInterfaceRefactoring,
-                            CheckConditionsOperation.FINAL_CONDITIONS), RefactoringCore
-                            .getConditionCheckingFailedSeverity());
-            
-            PerformChangeOperation performChangeOperation = new PerformChangeOperation(createChangeOperation);
-            
-            WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(performChangeOperation);
-            PlatformUI.getWorkbench().getProgressService().runInUI(
-                new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-
-            if (performChangeOperation.changeExecuted()) {
-                String packageName = type.getPackageFragment().getElementName();
-                if (packageName.trim().length() > 0) {
-                    packageName += ".";
-                }
-                String fullyQualifiedJavaInterfaceName = packageName + extractInterfaceProcessor.getTypeName();
-                model.setFullyQualifiedJavaInterfaceName(fullyQualifiedJavaInterfaceName);
-                model.setMethodMap(CXFModelUtils.getMethodMap(JDTUtils.getType(model.getProjectName(), 
-                        fullyQualifiedJavaInterfaceName), model));
-                
-                undoExtractInterfaceChange = performChangeOperation.getUndoChange();
-            }
-        } catch (JavaModelException jme) {
-            CXFCreationCorePlugin.log(jme.getStatus());
-        } catch (InvocationTargetException ite) {
-            CXFCreationCorePlugin.log(ite);
-        } catch (InterruptedException ie) {
-            CXFCreationCorePlugin.log(ie);
-        } 
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        if (undoExtractInterfaceChange != null) {
-            try {
-            	PerformChangeOperation changeOperation = new PerformChangeOperation(undoExtractInterfaceChange);
-            
-                WorkbenchRunnableAdapter adapter= new WorkbenchRunnableAdapter(changeOperation);
-                PlatformUI.getWorkbench().getProgressService().runInUI(
-                        new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-                
-                if (!startingPointType.getCompilationUnit().isConsistent()) {
-                    startingPointType.getCompilationUnit().makeConsistent(monitor);
-                }
-
-                model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-
-            } catch (JavaModelException jme) {
-                status = jme.getStatus();
-                CXFCreationCorePlugin.log(status);
-            } catch (InvocationTargetException ite) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
-                CXFCreationCorePlugin.log(status);
-            } catch (InterruptedException ie) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
-                CXFCreationCorePlugin.log(status);
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
deleted file mode 100644
index b3beece..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Java2WSValidateInputCommand extends AbstractDataModelOperation {
-    
-    private Java2WSDataModel model;
-
-    public Java2WSValidateInputCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
-        if (javaProject != null) {
-            IType type = JDTUtils.getType(javaProject, model.getJavaStartingPoint());
-            if (type == null || !type.exists()) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, 
-                        CXFCreationCoreMessages.bind(CXFCreationCoreMessages.JAVA2WS_SERVICE_IMPL_NOT_FOUND,
-                                new Object[] {model.getJavaStartingPoint(), model.getProjectName()}));
-            }
-            if (type.isBinary()) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID,
-                        CXFCreationCoreMessages.JAVA2WS_SERVICE_IMPL_NOT_BINARY);
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
deleted file mode 100644
index 38f9da5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command.
- *
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-    public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-
-    private WSDL2JavaDataModel model;
-    private IWebService ws;
-
-    private JavaResourceChangeListener javaResourceChangeListener;
-    private WebContentChangeListener webContentChangeListener;
-
-    public WSDL2JavaCommand(WSDL2JavaDataModel model, IWebService ws) {
-        this.model = model;
-        this.ws = ws;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        javaResourceChangeListener = new JavaResourceChangeListener(new Path(model.getJavaSourceFolder()));
-        webContentChangeListener = new WebContentChangeListener(model.getProjectName());
-
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-
-        String projectName = model.getProjectName();
-
-        //TODO revisit
-        ws.getWebServiceInfo().setImplURLs(new String[] {projectName + "/Impl.java"}); //$NON-NLS-1$
-
-        String[] progArgs = CommandLineUtils.getWSDL2JavaProgramArguments(model);
-
-        try {
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyW2JFilesFromTmp(model);
-
-            if (model.isGenerateImplementation()) {
-                SpringUtils.createConfigurationFromWSDL(model);
-            }
-
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } finally {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-            FileUtils.refreshProject(projectName, monitor);
-        }
-
-        return status;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-        return status;
-    }
-
-    public CXFDataModel getCXFDataModel() {
-        return model;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
deleted file mode 100644
index b105e2a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-@SuppressWarnings("restriction")
-public class WSDL2JavaDefaultingCommand extends AbstractDataModelOperation {
-    private WSDL2JavaDataModel model;
-    private String projectName;
-    private String inputURL;
-
-    private WebContentChangeListener webContentChangeListener;
-
-    public WSDL2JavaDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
-        this.model = model;
-        this.projectName = projectName;
-        this.inputURL = inputURL;
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked", "deprecation" })
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-    	IStatus status = Status.OK_STATUS;
-
-    	webContentChangeListener = new WebContentChangeListener(projectName);
-    	ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
-    	        IResourceChangeEvent.POST_CHANGE);
-
-        WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-        model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-        //
-        model.setGenerateImplementation(context.isGenerateImplementation());
-        model.setGenerateServer(context.isGenerateServer());
-        model.setDatabinding(context.getDatabinding());
-        model.setFrontend(context.getFrontend());
-        model.setWsdlVersion(context.getWsdlVersion());
-        model.setGenerateAntBuildFile(context.isGenerateAntBuildFile());
-        model.setIncludedNamespaces(new HashMap<String, String>());
-        model.setExcludedNamespaces(new HashMap<String, String>());
-
-        // XJC
-        model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
-        model.setXjcToString(context.isXjcToString());
-        model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
-        model.setXjcToStringSimple(context.isXjcToStringSimple());
-        model.setXjcLocator(context.isXjcLocator());
-        model.setXjcSyncMethods(context.isXjcSyncMethods());
-        model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
-        model.setValidate(context.isValidate());
-        model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
-        model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
-        model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
-        model.setUseDefaultValues(context.isUseDefaultValues());
-        model.setAutoNameResolution(context.isAutoNameResolution());
-        model.setNoAddressBinding(context.isNoAddressBinding());
-        model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
-        model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()).toOSString());
-
-    	try {
-    		Definition definition = null;
-        	IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        	IProject project = workspace.getRoot().getProject(projectName);
-        	URL wsdlUrl = new URL(inputURL);
-        	model.setWsdlURL(wsdlUrl);
-        	if (wsdlUrl.getProtocol().equals("file")) { //$NON-NLS-1$
-        		if (!FileUtils.isFileInWebContentFolder(project, new Path(wsdlUrl.getPath()))) {
-        		    IFolder wsdlFolder = WSDLUtils.getWSDLFolder(project);
-        			IPath wsdlFolderPath = wsdlFolder.getLocation();
-                    File fileToCopy = new File(wsdlUrl.toURI());
-        			WSDLCopier copier = new WSDLCopier();
-        			//for Eclipse 3.3 compatibility
-        			copier.setSourceURI(wsdlUrl.toExternalForm());
-        			copier.setTargetFolderURI(wsdlFolder.getLocationURI().toString());
-                    //copier.setTargetFolderURI(wsdlFolderPath.toFile().toString());
-        			workspace.run(copier, monitor);
-        			wsdlFolder.refreshLocal(IResource.DEPTH_ONE, monitor);
-        			File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(fileToCopy.getName()).toFile();
-        			model.setWsdlURL(wsdlFile.toURL());
-        		}
-            	definition = WSDLUtils.readWSDL(model.getWsdlURL());
-            	if (definition != null) {
-            	    setTNSOnModel(definition);
-            	    setWSDLLocation(definition);
-            	}
-        	} else {
-               	String filename = ""; //$NON-NLS-1$
-               	definition = WSDLUtils.readWSDL(wsdlUrl);
-        		if (definition != null) {
-                    Map servicesMap = definition.getServices();
-                    Set<Map.Entry> servicesSet = servicesMap.entrySet();
-                    setTNSOnModel(definition);
-                    setWSDLLocation(definition);
-
-                    for (Map.Entry serviceEntry : servicesSet) {
-                        Service service = (Service) serviceEntry.getValue();
-                        Map portsMap = service.getPorts();
-                        Set<Map.Entry> portsSet = portsMap.entrySet();
-                        for (Map.Entry portEntry : portsSet) {
-                            Port port = (Port) portEntry.getValue();
-                            PortType portType = port.getBinding().getPortType();
-                            QName qName = portType.getQName();
-                            filename = qName.getLocalPart() + WSDLUtils.WSDL_FILE_EXTENSION;
-                            break;
-                        }
-                    }
-        		}
-        		IPath wsdlFolderPath = WSDLUtils.getWSDLFolder(project).getLocation();
-            	WSDLCopier copier = new WSDLCopier();
-            	copier.setSourceURI(wsdlUrl.toExternalForm());
-            	copier.setTargetFolderURI(wsdlFolderPath.toFile().toURI().toString());
-            	copier.setTargetFilename(filename);
-            	workspace.run(copier, monitor);
-
-            	File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(filename).toFile();
-    			model.setWsdlURL(wsdlFile.toURI().toURL());
-        	}
-        	model.setWsdlFileName(getWSDLFileNameFromURL(model.getWsdlURL()));
-
-        	IPath wsdlLocationPath = new Path(model.getWsdlURL().getPath());
-        	wsdlLocationPath = wsdlLocationPath.removeFirstSegments(WSDLUtils.getWebContentFolder(project)
-        			.getLocation().matchingFirstSegments(wsdlLocationPath));
-
-        	if (wsdlLocationPath.getDevice() != null) {
-        	    wsdlLocationPath = wsdlLocationPath.setDevice(null);
-        	}
-        	model.setWsdlDefinition(definition);
-        	model.setConfigWsdlLocation(wsdlLocationPath.toString());
-
- 		} catch (CoreException ce) {
- 			status = ce.getStatus();
-			CXFCreationCorePlugin.log(status);
-		} catch (URISyntaxException urise) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, urise.getLocalizedMessage());
-			CXFCreationCorePlugin.log(status);
-		} catch (MalformedURLException murle) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, murle.getLocalizedMessage());
-			CXFCreationCorePlugin.log(murle);
-		} catch (IOException ioe) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-			CXFCreationCorePlugin.log(ioe);
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-        return status;
-    }
-
-    public String getWSDLFileNameFromURL(URL wsdlURL) {
-        IPath wsdlPath = new Path(wsdlURL.toExternalForm());
-        return wsdlPath.lastSegment();
-    }
-
-    private void setWSDLLocation(Definition definition) throws MalformedURLException {
-        String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
-        if (wsdlLocation != null) {
-            model.setWsdlLocation(wsdlLocation);
-        }
-    }
-
-    private void setTNSOnModel(Definition definition) {
-        String targetNamespace = definition.getTargetNamespace();
-        String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
-        model.setTargetNamespace(targetNamespace);
-        model.getIncludedNamespaces().put(targetNamespace, packageName);
-    }
-
-    public WSDL2JavaDataModel getWSDL2JavaDataModel() {
-        return model;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-
-        model.getBindingFiles().clear();
-        model.getIncludedNamespaces().clear();
-
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
deleted file mode 100644
index ef416b9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This is stop gap workaround for bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243286">#243286</a>
- * and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243290">#243290</a>
- * 
- *
- */
-public class WSDL2JavaProjectSelectionCommand extends AbstractDataModelOperation {
-	private WSDL2JavaDataModel model;
-	private IProject initialProject;
-	private IProject serverProject;
-	private IProject currentProject;
-	
-	public WSDL2JavaProjectSelectionCommand(WSDL2JavaDataModel model) {
-		this.model = model;
-	}
-	
-	@Override
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IStatus status = Status.OK_STATUS;
-
-		if (currentProject == null && initialProject == null && serverProject != null) {
-			status = Status.OK_STATUS;
-			model.setProjectName(serverProject.getName());
-			return status;
-		}
-		
-		if (currentProject == null && initialProject != null && !initialProject.equals(serverProject)) {
-			status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-					CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-							serverProject.getName(), initialProject.getName()}));
-		} else if (initialProject == null && currentProject != null && !currentProject.equals(serverProject)) { 
-            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-                    CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-                            serverProject.getName(), currentProject.getName()}));
-		} else if (initialProject != null && currentProject != null && !currentProject.equals(serverProject)) {
-            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-                    CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-                            serverProject.getName(), currentProject.getName()}));
-		} else { 
-		    model.setProjectName(serverProject.getProject().getName());
-			status = Status.OK_STATUS;
-		}
-		
-		if (!status.isOK()) {
-			try {
-				getEnvironment().getStatusHandler().report(status);
-			} catch (StatusException e) {
-				return new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 0, "", null);
-			}
-		}
-		return status;
-	}
-	
-	/*
-	 * The value to test against. Make sure the "Service Project"
-	 * and the project that contains the wsdl file match.
-	 */
-	public void setServerProject(IProject serverProject) {
-		this.serverProject = serverProject;
-	}
-	
-	/*
-	 * 
-	 * The initial project will be null when there's nothing selected in the project explorer
-	 * This forces the user to make a selection thus setting the project current project
-	 * below.
-	 * 
-	 * If there was an initial selection and the user changes from one top down service
-	 * type to another then we had to check.
-	 */
-	public void setInitialProject(IProject project) {
-		this.initialProject = project;
-	}
-	
-	/*
-	 * If there was an initial selection in the project explorer the above value is set and
-	 * this is set to null.
-	 * 
-	 * This will change however if the user modifies the text field or browses for a
-	 * wsdl file. Upon selecting a file in a valid location, this value gets set.
-	 * No problem in that situation.
-	 */
-	public void setProject(IProject project) {
-	    this.currentProject = project;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
deleted file mode 100644
index 2c253e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.creation.ui</name>
-	<comment></comment>
-	<projects>
-	<