This commit was manufactured by cvs2svn to create tag 'v201007072248'.
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 1ed17f9..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.annotations.core;singleton:=true
-Bundle-Version: 1.0.0.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.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 278e1e8..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
-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 366152d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
+++ /dev/null
@@ -1,115 +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="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <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 7aa03d5..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
+++ /dev/null
@@ -1,179 +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="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <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 4d4d0a8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
+++ /dev/null
@@ -1,120 +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="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <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 3c6daa8..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
+++ /dev/null
@@ -1,134 +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="since"/>
-      </appInfo>
-      <documentation>
-         1.0
-      </documentation>
-   </annotation>
-
-   <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 ec82089..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
+++ /dev/null
@@ -1,368 +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.util.List;
-
-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 name the member value pair "name".
-     * @param values an array of <code>Object</code> values. Supports  {@link java.lang.String}, {@link java.lang.Boolean}, {@link java.lang.Class} values.
-     * @return a new member value pair with the given name and array of values.
-     */
-    public static MemberValuePair createArrayMemberValuePair(AST ast, String name, Object[] values) {
-        return AnnotationsCore.createMemberValuePair(ast, name, createArrayValueLiteral(ast, values));
-    }
-
-    /**
-     * Creates a new {@link ArrayInitializer}.
-     * @param ast the {@link AST} that will be used to create the {@link ArrayInitializer}.
-     * @param values an array of <code>Object</code> values. Supports  {@link java.lang.String}, {@link java.lang.Boolean}, {@link java.lang.Class} values.
-     * @return a new srray initializer.
-     */
-    @SuppressWarnings("unchecked")
-    public static ArrayInitializer createArrayValueLiteral(AST ast, Object[] values) {
-        ArrayInitializer arrayInitializer = ast.newArrayInitializer();
-        for (Object value : values) {
-            if (value.equals(Class.class)) {
-                arrayInitializer.expressions().add(createTypeLiteral(ast, value.toString()));
-            }
-
-            if (value instanceof String) {
-                String stringValue = value.toString();
-                if (stringValue.endsWith(".class")) { //$NON-NLS-1$
-                    arrayInitializer.expressions().add(createTypeLiteral(ast, stringValue.substring(0,
-                            stringValue.lastIndexOf(".")))); //$NON-NLS-1$
-                } else {
-                    arrayInitializer.expressions().add(createStringLiteral(ast, stringValue));
-                }
-            }
-
-            if (value.equals(Boolean.TYPE)) {
-                arrayInitializer.expressions().add(createBooleanLiteral(ast, (Boolean) value));
-            }
-
-        }
-        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 ba93d16..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
+++ /dev/null
@@ -1,473 +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.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(IJavaElement javaElement) {
-        List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-
-        try {
-            List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(javaElement);
-
-            filterAnnotationsList(javaElement, 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) {
-            	if (annotationDefinition.getAnnotationClass() != null) {
-                    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;
-    }
-
-    /**
-     * 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;
-    }
-
-    static String getAttributeValue(IConfigurationElement configurationElement, String attributeName) {
-        String attribute = configurationElement.getAttribute(attributeName);
-        if (attribute != null) {
-            return attribute;
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    private static List<AnnotationDefinition> getAllAnnotationsForElement(IJavaElement javaElement)
-    throws JavaModelException {
-
-        if (javaElement instanceof IPackageDeclaration) {
-            return getAnnotationsForElementType(ElementType.PACKAGE);
-        }
-
-        if (javaElement instanceof IType) {
-            IType type = (IType) javaElement;
-            if (type.isAnnotation()) {
-                return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
-            }
-            return getAnnotationsForElementType(ElementType.TYPE);
-        }
-
-        if (javaElement instanceof IField) {
-            return getAnnotationsForElementType(ElementType.FIELD);
-        }
-
-        if (javaElement instanceof IMethod) {
-            return getAnnotationsForElementType(ElementType.METHOD);
-        }
-
-        if (javaElement instanceof ILocalVariable) {
-            return getAnnotationsForElementType(ElementType.PARAMETER);
-        }
-
-        if (javaElement 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(IJavaElement javaElement,
-            List<AnnotationDefinition> annotationDefinitions) throws JavaModelException {
-        Iterator<AnnotationDefinition> annotationIter = annotationDefinitions.iterator();
-        while (annotationIter.hasNext()) {
-            AnnotationDefinition annotationDefinition = annotationIter.next();
-
-            if (javaElement instanceof IType) {
-                IType type = (IType) javaElement;
-                if (isClassRestricted(type, annotationDefinition)
-                        || isInterfaceRestricted(type, annotationDefinition)
-                        || isEnumRestricted(type, annotationDefinition)) {
-                    annotationIter.remove();
-                }
-            }
-            if (javaElement instanceof IMethod) {
-                IMethod method = (IMethod) javaElement;
-                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 (javaElement instanceof IField) {
-                if(isClassRestricted(javaElement, annotationDefinition)
-                        || isInterfaceRestricted(javaElement, annotationDefinition)
-                        ||isEnumRestricted(javaElement, 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 e4c5d27..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,98 +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;
-
-/**
- * Abstract 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 abstract class AnnotationAttributeInitializer implements IAnnotationAttributeInitializer {
-
-    protected static final String MISSING_IDENTIFER = "$missing$";
-
-    protected AnnotationAttributeInitializer() {
-
-    }
-
-    /* (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 0fb5bae..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.getName(),
-                            (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 cabef2a..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,64 +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 interface for annotation attribute initializers.
- * <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>
- * @noimplement This interface is not intended to be implemented by clients.
- * @noextend This interface is not intended to be extended by clients.
- */
-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 315479a..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
+++ /dev/null
@@ -1,212 +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 org.eclipse.jdt.apt.core.util.EclipseMessager;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-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;
-
-    protected AbstractAnnotationProcessor() {
-
-    }
-
-    /**
-     * 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();
-
-    /**
-     * Prints an error message.
-     * @param position the position where the error occured, or null if it is unknown or not applicable
-     * @param message the message, or an empty string if none
-     */
-    protected void printError(SourcePosition position, String message) {
-        environment.getMessager().printError(position, message);
-    }
-
-    /**
-     * Prints an error message.
-     * @param message the message, or an empty string if none
-     */
-    protected void printError(String message) {
-        environment.getMessager().printError(message);
-    }
-
-    /**
-     * Prints a warning message.
-     * @param position the position where the warning occured, or null if it is unknown or not applicable
-     * @param message the message, or an empty string if none
-     */
-    protected void printWarning(SourcePosition position, String message) {
-        environment.getMessager().printWarning(position, message);
-    }
-
-    /**
-     * Prints a warning message.
-     * @param message the message, or an empty string if none
-     */
-    protected void printWarning(String message) {
-        environment.getMessager().printWarning(message);
-    }
-
-    /**
-     * Prints a notice.
-     * @param position the position where the notice occured, or null if it is unknown or not applicable
-     * @param message the message, or an empty string if none
-     */
-    protected void printNotice(SourcePosition position, String message) {
-        environment.getMessager().printNotice(position, message);
-    }
-
-    /**
-     * Prints a notice.
-     * @param message the message, or an empty string if none
-     */
-    protected void printNotice(String message) {
-        environment.getMessager().printNotice(message);
-    }
-
-    /**
-     * Print an error including the given arguments for use in quick-fixes.
-     * @param position position of the error
-     * @param message message to display to the user
-     */
-    protected void printFixableError(SourcePosition position, String message) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableError(position, message, "", message);
-        } else {
-            printError(position, message);
-        }
-    }
-
-    /**
-     * Print an error including the given arguments for use in quick-fixes.
-     * @param position position of the error
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableError(SourcePosition position, String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableError(position, message, pluginId, errorId);
-        } else {
-            printError(position, message);
-        }
-    }
-
-    /**
-     * Print an error including the given arguments for use in quick-fixes.
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableError(String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableError(message, pluginId, errorId);
-        } else {
-            printError(message);
-        }
-    }
-
-    /**
-     * Print a warning including the given arguments for use in quick-fixes.
-     * @param position position of the warning
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableWarning(SourcePosition position, String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableWarning(position, message, pluginId, errorId);
-        } else {
-            printWarning(position, message);
-        }
-    }
-
-    /**
-     * Print a warning including the given arguments for use in quick-fixes.
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableWarning(String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableWarning(message, pluginId, errorId);
-        } else {
-            printWarning(message);
-        }
-    }
-
-    /**
-     * Print a notice including the given arguments for use in quick-fixes.
-     * @param position position of the notice
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableNotice(SourcePosition position, String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableNotice(position, message, pluginId, errorId);
-        } else {
-            printNotice(position, message);
-        }
-    }
-
-    /**
-     * Print a notice including the given arguments for use in quick-fixes.
-     * @param message message to display to the user
-     * @param pluginId plug-in which will provide a java quick fix processor for this error. Cannot be null.
-     * @param errorId a plug-in provided error code which will be meaningful to the java quick fix processor. Cannot be null.
-     */
-    protected void printFixableNotice(String message, String pluginId, String errorId) {
-        if (environment.getMessager() instanceof EclipseMessager) {
-            EclipseMessager messager = (EclipseMessager) environment.getMessager();
-            messager.printFixableNotice(message, pluginId, errorId);
-        } else {
-            printNotice(message);
-        }
-    }
-
-}
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 d81033f..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
+++ /dev/null
@@ -1,1443 +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.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;
-    }
-
-    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);
-            if (typeDeclaration != null) {
-                return extractAnnotations(typeDeclaration.modifiers());
-            }
-        }
-
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            MethodDeclaration methodDeclaration = AnnotationUtils.getMethodDeclaration(method);
-            if (methodDeclaration != null) {
-                return extractAnnotations(methodDeclaration.modifiers());
-            }
-        }
-
-        if (javaElement.getElementType() == IJavaElement.FIELD) {
-            IField field = (IField) javaElement;
-            FieldDeclaration fieldDeclaration = AnnotationUtils.getFieldDeclaration(field);
-            if (fieldDeclaration != null) {
-                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 4663665..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);
-    }
-
-    private 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 50170f0..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: 1.0.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="[1.0.0,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
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/ant/cxf_bujava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
deleted file mode 100644
index 35664a5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/src/packagename/myService.java
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId 
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!--  Service.RuntimeId - ID of web service runtime 
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId -  ID of target server 
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Java Bean
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String    
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project.  type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- Generate a client mainline using JAX-WS APIs
-!--GenClient=false
-!-- Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!-- Specify to generate the wrapper and fault beans
-!--GenWrapperFaultBeans=true
-!-- Specify to generate the WSDL file
-!--GenWSDL=true
-!-- Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-!--GenXSDImports=true
-!--Specifies that the generated WSDL is to include a SOAP 1.2 binding
-!--UseSOAP12Binding=false
-!--Set the name of the generated WSDL file
-!--WsdlFileName=myWSDLFileName.wsdl
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
deleted file mode 100644
index 1d5f8b8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_bujava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_bujava.properties"/>
-	
-<echo message="calling the web services generation ant task: cxf_bujava"/>
- <target name="main" >
-  	 <wsgen/>
-  </target>
-  
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
deleted file mode 100644
index 90292ce..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.properties
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Shane Clarke - Apache CXF support
-###############################################################################
-!--ScenarioType REQUIRED. Differentiates from "service" scenario.
-ScenarioType=client
-
-!--InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java.
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list values for the following properties:
-!-- Client.RuntimeId, Client.ServerId 
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
- 
-!--Client.RuntimeId - ID of web service runtime 
-Client.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!--Client.ServerId - ID of target server 
-Client.ServerId=org.eclipse.jst.server.tomcat.60
-
-!--ClientProjectName - name of Client project - this property can be used to give the client project a 
-!-- different name than the project containing the initial selection
-!--ClientProjectName=clientProjectName
-
-!--ClientEarProjectName- name of Client EAR project - set only if applicable for selected server type
-!--ClientEarProjectName=clientEARProjectName
-
-!--ClientComponentType - type of Client project
-!--ClientComponentType=template.cxf.core
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Generate Client : REQUIRED
-GenClient=true
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package  
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
deleted file mode 100644
index 2d3a566..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_client.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_client.properties"/>
-	
-<echo message="calling the web services generation ant task: cxf_client"/>
- <target name="main" >
-  	 <wsgen/>
-  </target>
-  
-</project>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
deleted file mode 100644
index 8e6e887..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.properties
+++ /dev/null
@@ -1,83 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Shane Clarke - Apache CXF support
-###############################################################################
-!-- ScenarioType REQUIRED. Differentiates from "client" scenario.
-ScenarioType=service
-
-!-- InitialSelection REQUIRED.  Workspace relative URI to the input WSDL or Java
-InitialSelection=/dynamicWebProjectName/WebContent/wsdl/myService.wsdl
-
-!--Utility property values - use these to list valid values for the following properties:
-!-- Service.RuntimeId, Service.ServerId 
-ListRuntimes=true
-ListServers=true
-!-- Verbose will list informational messages as well as errors if set to true
-Verbose=true
-
-!--  Service.RuntimeId - ID of web service runtime 
-Service.RuntimeId=org.eclipse.jst.ws.cxf.cxfWebServiceRT
-!-- Service.ServerId -  ID of target server 
-Service.ServerId=org.eclipse.jst.server.tomcat.60
-!-- Service.TypeId - Java Bean is default for both Top Down and Bottom Up
-!-- Service.TypeId=Java Bean
-
-!-- ServiceProjectName - !--type:String - name of Service project - this property can be used to give the service project a different name than the project containing the initial selection.  type: String    
-!--ServiceProjectName=serviceProjectName
-!-- ServiceEarProjectName - !--type:String - name of Service EAR project - this property can be used to give the service EAR project a different name than the EAR project already associated with the service project.  type: String
-!--ServiceEarProjectName=serviceEarProjectName
-
-!-- JavaOutput
-!-- Top down - String: the workspace relative URI for a Java source folder for the generated Java code - must be existing workspace source folder
-!--JavaOutput=/projectName/JavaSource
-
-!--Specify the name of the WSDL service for which code is to be generated. The default is to generate code for every service in the WSDL document
-!--ServiceName=myService
-
-!--Generate a server mainline using JAX-WS APIs
-!--GenServer=false
-!--Generate starting point code for an implementation object
-!--GenImpl=true
-!--Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-!--DefaultValues=true
-!--Enables or disables processing of extended soap header message binding
-!--ExtSOAPHeaders=false
-!--Enables or disables loading of the default namespace package name mapping
-!--DefaultNamespace=true
-!--Enables or disables loading of the default excludes namespace mapping
-!--DefaultExcludesNamespace=true
-!--Enable Auto Name Resolution
-!--AutoNameResolution=false
-
-!--XJC Args: Specify the arguments to be passed directly to the XJC
-
-!--Initialise fields mapped from elements with their default values
-!--xjc_dv=false
-!--Activate plugin to add a toString() method to generated classes
-!--xjc_ts=false
-!--Have toString produce multi line output
-!--xjc_ts_multi=false
-!--Have toString produce single line terse output
-!--xjc_ts_simple=false
-!--Enable source location support for generated code
-!--xjc_locator=false
-!--Generate accessor methods with the 'synchronized' keyword
-!--xjc_sync_methods=false
-!--Add @Generated annotations to the generated code
-!--xjc_mark_generated=false
-
-!-- Mappings
-!-- Top down scenario. Workspace relative URI to property file containing mappings.
-!-- Mappings are used to override the default package names of the generated Java template classes.
-!-- The content of the properties file must be of the format namespace=package  
-!--Mappings=/dynamicWebProjectName/mappings.txt
-
-!--Binding Files. Comma delimited string of absolute paths in the local file system of JAXWS or JAXB binding files.
-!--Bindings=C:/workspace1/dynamicWebProjectName/binding1.xml,C:/workspace1/dynamicWebProjectName/binding2.xml
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
deleted file mode 100644
index 2c79c6b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/ant/cxf_tdjava.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<project default="main" basedir=".">
-
-<echo message="pulling in property files"/>
-<property file="cxf_tdjava.properties"/>
-	
-<echo message="calling the web services generation ant task: cxf_tdjava"/>
- <target name="main" >
-  	 <wsgen/>
-  </target>
-  
-</project>
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 d0ad5cd..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               ant/
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 f6814ae..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.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 Consumption Core
-pluginProvider=Eclipse Web Tools Platform
-
-WEB_SERVICE_LOCATOR_CXF=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_CXF=Apache CXF Components
-
-LABEL_RUNTIME_CXF=Apache CXF
-LABEL_BOTTOM_UP_JAVA_BEAN=Bottom up Java bean Web Service
-LABEL_TOP_DOWN_JAVA_BEAN=Top down Java bean Web Service
-LABEL_CLIENT=Client
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 2137477..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,46 +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>
-
-   <extension point="org.eclipse.wst.command.env.ui.antfiles">
-      <antfiles
-         id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTBUJava"
-    	 runtimeid="cxf"
-    	 pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
-    	 path="ant/cxf_bujava.properties"
-    	 wsgenpath="ant/cxf_bujava.xml"
-    	 runtimelabel="%LABEL_RUNTIME_CXF"
-    	 scenariolabel="%LABEL_BOTTOM_UP_JAVA_BEAN">
-  	  </antfiles>
-      <antfiles
-         id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTTopJava"
-         runtimeid="cxf"
-         pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
-         path="ant/cxf_tdjava.properties"
-         wsgenpath="ant/cxf_tdjava.xml"
-         runtimelabel="%LABEL_RUNTIME_CXF"
-         scenariolabel="%LABEL_TOP_DOWN_JAVA_BEAN">
-  	  </antfiles>
-  	  <antfiles
-         id="org.eclipse.jst.ws.cxf.creation.cxfWebServiceRTZClient"
-         runtimeid="cxf"
-         pluginlocation="org.eclipse.jst.ws.cxf.consumption.core"
-         path="ant/cxf_client.properties"
-         wsgenpath="ant/cxf_client.xml"
-         runtimelabel="%LABEL_RUNTIME_CXF"
-         scenariolabel="%LABEL_CLIENT">
-      </antfiles>
-   </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 0525ff5..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,179 +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 java.util.Map;
-
-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;
-    }
-
-    //ANT Environment Mappings
-    public void setJavaSourceFolder(String javaSourceFolder) {
-        model.setJavaSourceFolder(javaSourceFolder);
-    }
-
-    public void setServiceName(String serviceName) {
-        model.setServiceName(serviceName);
-    }
-
-    public void setGenerateServer(boolean generateServer) {
-        model.setGenerateServer(generateServer);
-    }
-
-    public void setGenerateClient(boolean generateClient) {
-        model.setGenerateClient(generateClient);
-    }
-
-    public void setGenerateImplementation(boolean generateImplementation) {
-        model.setGenerateImplementation(generateImplementation);
-    }
-
-    public void setUseDefaultValues(boolean useDefaultValues) {
-        model.setUseDefaultValues(useDefaultValues);
-    }
-
-    public void setProcessSOAPHeaders(boolean processSOAPHeaders) {
-        model.setProcessSOAPHeaders(processSOAPHeaders);
-    }
-
-    public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
-        model.setLoadDefaultNamespacePackageNameMapping(loadDefaultNamespacePackageNameMapping);
-    }
-
-    public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
-        model.setLoadDefaultExcludesNamepsaceMapping(loadDefaultExcludesNamepsaceMapping);
-    }
-
-    public void setAutoNameResolution(boolean autoNameResolution) {
-        model.setAutoNameResolution(autoNameResolution);
-    }
-
-    public void setXjcUseDefaultValues(boolean xjcUseDefaultValues) {
-        model.setXjcUseDefaultValues(xjcUseDefaultValues);
-    }
-
-    public void setXjcToString(boolean xjcToString) {
-        model.setXjcToStringSimple(xjcToString);
-    }
-
-    public void setXjcToStringSimple(boolean xjcToStringSimple) {
-        model.setXjcToStringSimple(xjcToStringSimple);
-    }
-
-    public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
-        model.setXjcToStringMultiLine(xjcToStringMultiLine);
-    }
-
-    public void setXjcLocator(boolean xjcLocator) {
-        model.setXjcLocator(xjcLocator);
-    }
-
-    public void setXjcSyncMethods(boolean xjcSyncMethods) {
-        model.setXjcSyncMethods(xjcSyncMethods);
-    }
-
-    public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
-        model.setXjcMarkGenerated(xjcMarkGenerated);
-    }
-
-    @SuppressWarnings("unchecked")
-    public void setIncludedNamespaces(Map value) {
-        model.setIncludedNamespaces(value);
-    }
-
-    public void setBindingFiles(List<String> bindingFiles) {
-        for (String path : bindingFiles) {
-            model.getBindingFiles().add(path);
-        }
-    }
-}
\ 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/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 f0b4800..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.setDefaultRuntimeVersion(context.getDefaultRuntimeVersion());
-        model.setDefaultRuntimeType(context.getDefaultRuntimeType());
-        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 185f782..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: 1.0.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="[1.0.0,1.1.0)",
- 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="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.cxf.ui;bundle-version="[1.0.0,1.1.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="[1.0.0,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
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 1427506..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
-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 29981a1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,135 +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>
-
-    <!-- WSDL2Java -->
-    <extension point="org.eclipse.wst.command.env.antDataMapping">
-       <map
-             key="Mappings"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="IncludedNamespaces"
-             transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.MappingsTransformer"/>
-       <map
-             key="Bindings"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="BindingFiles"
-             transform="org.eclipse.jst.ws.internal.cxf.core.env.ant.BindingsTransformer"/>
-       <map
-             key="JavaOutput"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="JavaSourceFolder"/>
-       <map
-             key="ServiceName"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="ServiceName"/>
-       <map
-             key="GenClient"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="GenerateClient"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="GenServer"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="GenerateServer"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="GenImpl"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="GenerateImplementation"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="DefaultValues"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="UseDefaultValues"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="ExtSOAPHeaders"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="ProcessSOAPHeaders"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="DefaultNamespace"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="LoadDefaultNamespacePackageNameMapping"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="DefaultExcludesNamespace"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="LoadDefaultExcludesNamepsaceMapping"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="AutoNameResolution"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="AutoNameResolution"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_dv"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcUseDefaultValues"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_ts"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcToString"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_ts_multi"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcToStringMultiLine"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_ts_simple"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcToStringSimple"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_locator"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcLocator"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_sync_methods"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcSyncMethods"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-       <map
-             key="xjc_mark_generated"
-             operation="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand"
-             property="XjcMarkGenerated"
-             transform="org.eclipse.wst.command.internal.env.ant.String2BooleanTransformer"/>
-    </extension>
-  </plugin>
\ 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/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 0494f83..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,278 +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.CENTER, 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.CENTER, 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 48828a1..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.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
-        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.getDefaultRuntimeType(), context.getDefaultRuntimeVersion()});
-        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 ac49f67..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.getDefaultRuntimeVersion().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 9eddde6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,61 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.core;singleton:=true
-Bundle-Version: 1.0.0.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.env.ant;x-internal:=true,
- 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.3.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="[1.0.0,1.1.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- javax.jws;bundle-version="[2.0.0,2.1.0)",
- org.eclipse.jst.ws.jaxws.ui;bundle-version="[1.0.0,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.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 3fe9244..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\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008, 2010.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/\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
Binary files differ
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
Binary files differ
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 5c79f26..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
+++ /dev/null
@@ -1,173 +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="defaultRuntimeLocation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultRuntimeType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultRuntimeVersion"
-        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"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="installations" transient="true">
-      <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="#//CXFInstall"/>
-      </eGenericType>
-    </eStructuralFeatures>
-  </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"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CXFInstall">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</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 32d9d55..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
+++ /dev/null
@@ -1,105 +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="" suppressEMFTypes="true"
-    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"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//CXFContext/cxfInstallLocations"/>
-    </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 9479796..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
-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 0be1826..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
+++ /dev/null
@@ -1,89 +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.5"/>
-      	        <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"/>
-             <config-factory class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetInstallActionConfigFactory"/>
-    	  </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.web25.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.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 cd8c84d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
+++ /dev/null
@@ -1,131 +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.resources.IProject;
-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;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-
-public class CXFClasspathContainer implements IClasspathContainer {
-
-    private IPath path;
-    private List<IClasspathEntry> classpathEntries;
-    private IProject project;
-    private String installed;
-
-    public CXFClasspathContainer(IPath path, IJavaProject javaProject) {
-        this.path = path;
-        this.project = javaProject.getProject();
-        classpathEntries =  new ArrayList<IClasspathEntry>();
-    }
-
-    public IClasspathEntry[] getClasspathEntries() {
-        if (!installed.equals(CXFCorePlugin.getDefault().getCXFRuntimeVersion(project))) {
-            classpathEntries.clear();
-        }
-
-        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 //$NON-NLS-1$
-                            && fileName.substring(fileName.lastIndexOf("."), fileName.length()).equals( //$NON-NLS-1$
-                            ".jar")) { //$NON-NLS-1$
-                        classpathEntries.add(JavaCore.newLibraryEntry(new Path(file.getAbsolutePath()), null,
-                                new Path("/"))); //$NON-NLS-1$
-                    }
-                }
-            }
-        }
-        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, getCxfRuntimeType(),
-                getCxfRuntimeVersion());
-    }
-
-    public int getKind() {
-        return K_APPLICATION;
-    }
-
-    public IPath getPath() {
-        return path;
-    }
-
-    private CXFInstall getCxfInstall() {
-        String installed = CXFCorePlugin.getDefault().getCXFRuntimeVersion(project);
-        this.installed = installed;
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        CXFInstall cxfInstall = context.getInstallations().get(installed);
-        return cxfInstall;
-    }
-
-    private String getCxfRuntimeLocation() {
-        CXFInstall cxfInstall = getCxfInstall();
-        if (cxfInstall != null) {
-            return cxfInstall.getLocation();
-        }
-
-        return CXFCorePlugin.getDefault().getJava2WSContext().getDefaultRuntimeLocation();
-    }
-
-    private String getCxfRuntimeVersion() {
-        CXFInstall cxfInstall = getCxfInstall();
-        if (cxfInstall != null) {
-            return cxfInstall.getVersion();
-        }
-
-        return CXFCorePlugin.getDefault().getJava2WSContext().getDefaultRuntimeVersion();
-    }
-
-    private String getCxfRuntimeType() {
-        CXFInstall cxfInstall = getCxfInstall();
-        if (cxfInstall != null) {
-            return cxfInstall.getType();
-        }
-
-        return CXFCorePlugin.getDefault().getJava2WSContext().getDefaultRuntimeType();
-    }
-
-    private File getCXFLibraryDirectory() {
-        IPath cxfLibPath = new Path(getCxfRuntimeLocation());
-        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 93e946e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
+++ /dev/null
@@ -1,44 +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);
-        }
-    }
-
-    @Override
-    public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-        return true;
-    }
-
-    @Override
-    public void requestClasspathContainerUpdate(IPath containerPath, IJavaProject javaProject,
-            IClasspathContainer containerSuggestion) throws CoreException {
-        JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {javaProject},
-                new IClasspathContainer[] { containerSuggestion }, 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 5631ef8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.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.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-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;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * 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$
-
-    //CXF Classpath container ID
-    public static final String CXF_CLASSPATH_CONTAINER_ID = "org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER"; //$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)
-     */
-    @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 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().getDefaultRuntimeVersion();
-        if (cxfRuntimeVersion.length() == 0) {
-            cxfRuntimeVersion = "0.0.0";
-        }
-        this.currentRuntimeVersion = new Version(cxfRuntimeVersion);
-        //}
-        return currentRuntimeVersion;
-    }
-
-    public void setCurrentRuntimeVersion(Version version) {
-        this.currentRuntimeVersion = version;
-    }
-
-    public void setCXFRuntimeVersion(IProject project, String cxfRuntimeVersion) {
-        IEclipsePreferences prefs = getProjectPreferences(project);
-        prefs.put(PLUGIN_ID + ".runtime.version", cxfRuntimeVersion);
-        flush(prefs);
-    }
-
-    public String getCXFRuntimeVersion(IProject project) {
-        IEclipsePreferences prefs = getProjectPreferences(project);
-        return prefs.get(PLUGIN_ID + ".runtime.version",
-                CXFCorePlugin.getDefault().getJava2WSContext().getDefaultRuntimeVersion());
-    }
-
-    private static void flush(IEclipsePreferences prefs) {
-        try {
-            prefs.flush();
-        } catch (BackingStoreException bse) {
-            log(bse);
-        }
-    }
-
-    /**
-     * Return the CXF preferences for the specified Eclipse project.
-     */
-    public IEclipsePreferences getProjectPreferences(IProject project) {
-        IScopeContext context = new ProjectScope(project);
-        return context.getNode(PLUGIN_ID);
-    }
-
-    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 fb0928c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
+++ /dev/null
@@ -1,176 +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 java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-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.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall;
-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 {
-    private Map<String, CXFInstall> installations;
-
-    /**
-     * String constant used to lookup the CXF runtime location general
-     * preference from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_DEFAULT_RUNTIME_LOCATION = "defaultRuntimeLocation"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the CXF runtime type general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_DEFAULT_RUNTIME_TYPE = "defaultRuntimeType"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the CXF version general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_DEFAULT_RUNTIME_VERSION = "defaultRuntimeVersion"; //$NON-NLS-1$
-
-    private static final String PREFERENCE_CXF_RUNTIME_VERSIONS = "cxfRuntimeVersions"; //$NON-NLS-1$
-    private static final String PREFERENCE_CXF_RUNTIME_LOCATIONS = "cxfRuntimeLocations"; //$NON-NLS-1$
-    private static final String PREFERENCE_CXF_RUNTIME_TYPES = "cxfRuntimeTypes"; //$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_DEFAULT_RUNTIME_LOCATION, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_DEFAULT_RUNTIME_TYPE, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_DEFAULT_RUNTIME_VERSION, ""); //$NON-NLS-1$
-
-        setDefault(PREFERENCE_CXF_RUNTIME_VERSIONS, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_LOCATIONS, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_TYPES, ""); //$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 Map<String, CXFInstall> getInstallations() {
-        if (installations == null) {
-            installations = new HashMap<String, CXFInstall>();
-            String versions = getValueAsString(PREFERENCE_CXF_RUNTIME_VERSIONS).trim();
-            String loctions = getValueAsString(PREFERENCE_CXF_RUNTIME_LOCATIONS).trim();
-            String types = getValueAsString(PREFERENCE_CXF_RUNTIME_TYPES).trim();
-            if (versions.trim().length() > 0 && loctions.trim().length() > 0 && types.trim().length() > 0) {
-                String[] cxfVersions = versions.split(",");
-                String[] cxfLocations = loctions.split(",");
-                String[] cxfTypes = types.split(",");
-                for (int i = 0; i < cxfVersions.length; i++) {
-                    CXFInstall cxfInstall = CXFFactory.eINSTANCE.createCXFInstall();
-                    cxfInstall.setVersion(cxfVersions[i]);
-                    cxfInstall.setLocation(cxfLocations[i]);
-                    cxfInstall.setType(cxfTypes[i]);
-                    installations.put(cxfVersions[i], cxfInstall);
-                }
-            }
-        }
-        return installations;
-    }
-
-    public void setInstallations(Map<String, CXFInstall> installations) {
-        this.installations = installations;
-
-        Collection<CXFInstall> installs = installations.values();
-
-        StringBuilder versions = new StringBuilder();
-        StringBuilder locations = new StringBuilder();
-        StringBuilder types = new StringBuilder();
-        Iterator<CXFInstall> installIter = installs.iterator();
-        while (installIter.hasNext()) {
-            CXFInstall cxfInstall = installIter.next();
-            versions.append(cxfInstall.getVersion());
-            locations.append(cxfInstall.getLocation());
-            types.append(cxfInstall.getType());
-            if (installIter.hasNext()) {
-                versions.append(",");
-                locations.append(",");
-                types.append(",");
-            }
-        }
-        setValue(PREFERENCE_CXF_RUNTIME_VERSIONS, versions.toString());
-        setValue(PREFERENCE_CXF_RUNTIME_LOCATIONS, locations.toString());
-        setValue(PREFERENCE_CXF_RUNTIME_TYPES, types.toString());
-    }
-
-    public String getDefaultRuntimeLocation() {
-        return getValueAsString(PREFERENCE_DEFAULT_RUNTIME_LOCATION);
-    }
-
-    public void setDefaultRuntimeLocation(String runtimeLocation) {
-        setValue(PREFERENCE_DEFAULT_RUNTIME_LOCATION, runtimeLocation);
-    }
-
-    public String getDefaultRuntimeType() {
-        return getValueAsString(PREFERENCE_DEFAULT_RUNTIME_TYPE);
-    }
-
-    public void setDefaultRuntimeType(String runtimeEdition) {
-        setValue(PREFERENCE_DEFAULT_RUNTIME_TYPE, runtimeEdition);
-    }
-
-    public String getDefaultRuntimeVersion() {
-        return getValueAsString(PREFERENCE_DEFAULT_RUNTIME_VERSION);
-    }
-
-    public void setDefaultRuntimeVersion(String runtimeVersion) {
-        setValue(PREFERENCE_DEFAULT_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 a42090a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
+++ /dev/null
@@ -1,269 +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());
-    }
-
-    @Override
-    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/env/ant/BindingsTransformer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/env/ant/BindingsTransformer.java
deleted file mode 100644
index 2c6005e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/env/ant/BindingsTransformer.java
+++ /dev/null
@@ -1,34 +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.core.env.ant;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class BindingsTransformer implements Transformer {
-
-    public Object transform(Object value) {
-        List<String> bindingFilesList = new ArrayList<String>();
-        String[] absolutePaths = value.toString().split(",");
-        for (String absoulutePath : absolutePaths) {
-            IPath path = new Path(absoulutePath);
-            if (path.getFileExtension() != null && path.getFileExtension().equals("xml")) {
-                bindingFilesList.add(absoulutePath);
-            }
-        }
-        return bindingFilesList;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/env/ant/MappingsTransformer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/env/ant/MappingsTransformer.java
deleted file mode 100644
index 928f2e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/env/ant/MappingsTransformer.java
+++ /dev/null
@@ -1,47 +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.core.env.ant;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-public class MappingsTransformer implements Transformer {
-
-    @SuppressWarnings("unchecked")
-    public Object transform(Object value) {
-        Map map = new HashMap();
-        IPath path = new Path((String)value);
-        IFile resource = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-        if (resource != null) {
-            try {
-                Properties props = new Properties();
-                props.load(resource.getContents());
-                map.putAll(props);
-            } catch (IOException ioe)  {
-                CXFCorePlugin.log(ioe);
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        return map;
-    }
-
-}
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 b27e136..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
+++ /dev/null
@@ -1,271 +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;
-
-/**
- * 
- * @model abstract="true" interface="true"
- */
-public interface CXFContext {
-
-    /**
-     * Returns the value of the '<em><b>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * Returns the default CXF Home Directory location.
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Default Runtime Location</em>' attribute.
-     * @see #setDefaultRuntimeLocation(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_DefaultRuntimeLocation()
-     * @model
-     * @generated
-     */
-    String getDefaultRuntimeLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeLocation <em>Default Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the default CXF runtime location.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Default Runtime Location</em>' attribute.
-     * @see #getDefaultRuntimeLocation()
-     * @generated
-     */
-    void setDefaultRuntimeLocation(String value);
-
-    /**
-     * Returns the value of the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     *  Returns the default CXF runtime type.
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Default Runtime Type</em>' attribute.
-     * @see #setDefaultRuntimeType(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_DefaultRuntimeType()
-     * @model
-     * @generated
-     */
-    String getDefaultRuntimeType();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeType <em>Default Runtime Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the default CXF runtime type.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Default Runtime Type</em>' attribute.
-     * @see #getDefaultRuntimeType()
-     * @generated
-     */
-    void setDefaultRuntimeType(String value);
-
-    /**
-     * Returns the value of the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     *  Returns the default CXF runtime version.
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Default Runtime Version</em>' attribute.
-     * @see #setDefaultRuntimeVersion(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_DefaultRuntimeVersion()
-     * @model
-     * @generated
-     */
-    String getDefaultRuntimeVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeVersion <em>Default Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the default CXF runtime version.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Default Runtime Version</em>' attribute.
-     * @see #getDefaultRuntimeVersion()
-     * @generated
-     */
-    void setDefaultRuntimeVersion(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);
-
-    /**
-     * Returns the value of the '<em><b>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Installations</em>' reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Installations</em>' attribute.
-     * @see #setInstallations(Map)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_Installations()
-     * @model transient="true"
-     * @generated
-     */
-    Map<String, CXFInstall> getInstallations();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getInstallations <em>Installations</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Installations</em>' attribute.
-     * @see #getInstallations()
-     * @generated
-     */
-    void setInstallations(Map<String, CXFInstall> 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 7b239e8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
+++ /dev/null
@@ -1,70 +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.2 2010/01/17 19:56:56 sclarke 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 a new object of class '<em>Install</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Install</em>'.
-     * @generated
-     */
-    CXFInstall createCXFInstall();
-
-    /**
-     * 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/CXFInstall.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFInstall.java
deleted file mode 100644
index 1321727..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFInstall.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Copyright (c) 2010 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
- *
- * $Id: CXFInstall.java,v 1.1 2010/01/17 19:56:56 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Install</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getVersion <em>Version</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFInstall()
- * @model
- * @generated
- */
-public interface CXFInstall {
-    /**
-     * Returns the value of the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Version</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Version</em>' attribute.
-     * @see #setVersion(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFInstall_Version()
-     * @model
-     * @generated
-     */
-    String getVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getVersion <em>Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Version</em>' attribute.
-     * @see #getVersion()
-     * @generated
-     */
-    void setVersion(String value);
-
-    /**
-     * Returns the value of the '<em><b>Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Location</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Location</em>' attribute.
-     * @see #setLocation(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFInstall_Location()
-     * @model
-     * @generated
-     */
-    String getLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getLocation <em>Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Location</em>' attribute.
-     * @see #getLocation()
-     * @generated
-     */
-    void setLocation(String value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(String)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFInstall_Type()
-     * @model
-     * @generated
-     */
-    String getType();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(String value);
-
-} // CXFInstall
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 acecdeb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
+++ /dev/null
@@ -1,3546 +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.4 2010/01/17 19:56:56 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__DEFAULT_RUNTIME_LOCATION = 0;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__DEFAULT_RUNTIME_TYPE = 1;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__DEFAULT_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 feature id for the '<em><b>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__INSTALLATIONS = 11;
-
-    /**
-     * The number of structural features of the '<em>Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT_FEATURE_COUNT = 12;
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__DEFAULT_RUNTIME_LOCATION = CXF_CONTEXT__DEFAULT_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__DEFAULT_RUNTIME_TYPE = CXF_CONTEXT__DEFAULT_RUNTIME_TYPE;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__DEFAULT_RUNTIME_VERSION = CXF_CONTEXT__DEFAULT_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>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__INSTALLATIONS = CXF_CONTEXT__INSTALLATIONS;
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__DEFAULT_RUNTIME_LOCATION = CXF_CONTEXT__DEFAULT_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__DEFAULT_RUNTIME_TYPE = CXF_CONTEXT__DEFAULT_RUNTIME_TYPE;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__DEFAULT_RUNTIME_VERSION = CXF_CONTEXT__DEFAULT_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>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__INSTALLATIONS = CXF_CONTEXT__INSTALLATIONS;
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__DEFAULT_RUNTIME_LOCATION = CXF_DATA_MODEL__DEFAULT_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__DEFAULT_RUNTIME_TYPE = CXF_DATA_MODEL__DEFAULT_RUNTIME_TYPE;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__DEFAULT_RUNTIME_VERSION = CXF_DATA_MODEL__DEFAULT_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>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__INSTALLATIONS = CXF_DATA_MODEL__INSTALLATIONS;
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__DEFAULT_RUNTIME_LOCATION = CXF_CONTEXT__DEFAULT_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__DEFAULT_RUNTIME_TYPE = CXF_CONTEXT__DEFAULT_RUNTIME_TYPE;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__DEFAULT_RUNTIME_VERSION = CXF_CONTEXT__DEFAULT_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>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__INSTALLATIONS = CXF_CONTEXT__INSTALLATIONS;
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__DEFAULT_RUNTIME_LOCATION = CXF_DATA_MODEL__DEFAULT_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__DEFAULT_RUNTIME_TYPE = CXF_DATA_MODEL__DEFAULT_RUNTIME_TYPE;
-
-    /**
-     * The feature id for the '<em><b>Default Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__DEFAULT_RUNTIME_VERSION = CXF_DATA_MODEL__DEFAULT_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>Installations</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__INSTALLATIONS = CXF_DATA_MODEL__INSTALLATIONS;
-
-    /**
-     * 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.impl.CXFInstallImpl <em>Install</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFInstallImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFInstall()
-     * @generated
-     */
-    int CXF_INSTALL = 6;
-
-    /**
-     * The feature id for the '<em><b>Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_INSTALL__VERSION = 0;
-
-    /**
-     * The feature id for the '<em><b>Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_INSTALL__LOCATION = 1;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_INSTALL__TYPE = 2;
-
-    /**
-     * The number of structural features of the '<em>Install</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_INSTALL_FEATURE_COUNT = 3;
-
-    /**
-     * 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 = 7;
-
-    /**
-     * 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 = 8;
-
-    /**
-     * 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 = 9;
-
-    /**
-     * 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 = 10;
-
-    /**
-     * 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 = 11;
-
-    /**
-     * 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 = 12;
-
-
-    /**
-     * 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#getDefaultRuntimeLocation <em>Default Runtime Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Default Runtime Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeLocation()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_DefaultRuntimeLocation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeType <em>Default Runtime Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Default Runtime Type</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeType()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_DefaultRuntimeType();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeVersion <em>Default Runtime Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Default Runtime Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDefaultRuntimeVersion()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_DefaultRuntimeVersion();
-
-    /**
-     * 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 the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getInstallations <em>Installations</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Installations</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getInstallations()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Installations();
-
-    /**
-     * 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 class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall <em>Install</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Install</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall
-     * @generated
-     */
-    EClass getCXFInstall();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getVersion <em>Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getVersion()
-     * @see #getCXFInstall()
-     * @generated
-     */
-    EAttribute getCXFInstall_Version();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getLocation <em>Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getLocation()
-     * @see #getCXFInstall()
-     * @generated
-     */
-    EAttribute getCXFInstall_Location();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFInstall#getType()
-     * @see #getCXFInstall()
-     * @generated
-     */
-    EAttribute getCXFInstall_Type();
-
-    /**
-     * 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>Default Runtime Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__DEFAULT_RUNTIME_LOCATION = eINSTANCE.getCXFContext_DefaultRuntimeLocation();
-
-        /**
-         * The meta object literal for the '<em><b>Default Runtime Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__DEFAULT_RUNTIME_TYPE = eINSTANCE.getCXFContext_DefaultRuntimeType();
-
-        /**
-         * The meta object literal for the '<em><b>Default Runtime Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__DEFAULT_RUNTIME_VERSION = eINSTANCE.getCXFContext_DefaultRuntimeVersion();
-
-        /**
-         * 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 '<em><b>Installations</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__INSTALLATIONS = eINSTANCE.getCXFContext_Installations();
-
-        /**
-         * 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();
-