This commit was manufactured by cvs2svn to create tag 'v200907061934'.
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.classpath b/bundles/org.eclipse.jst.ws.annotations.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.project b/bundles/org.eclipse.jst.ws.annotations.core/.project
deleted file mode 100644
index 133e566..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.annotations.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6ee33b2..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 09 20:36:45 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index ffabbea..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.annotations.core;singleton:=true
-Bundle-Version: 0.5.1.qualifier
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
-Eclipse-BuddyPolicy: registered
-Require-Bundle: org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)"
-Export-Package: org.eclipse.jst.ws.annotations.core,
- org.eclipse.jst.ws.annotations.core.initialization,
- org.eclipse.jst.ws.annotations.core.processor,
- org.eclipse.jst.ws.annotations.core.utils
-Bundle-Activator: org.eclipse.jst.ws.annotations.core.AnnotationsCorePlugin
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/about.html b/bundles/org.eclipse.jst.ws.annotations.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 19, 2009</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/build.properties b/bundles/org.eclipse.jst.ws.annotations.core/build.properties
deleted file mode 100644
index 921a77d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               schema/,\
-               plugin.properties,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties b/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
deleted file mode 100644
index 2a7f89b..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 Shane Clarke and others
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Shane Clarke - initial API and implementation
-###############################################################################
-
-#properties file for Annotations Core
-pluginName= Annotations Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml b/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
deleted file mode 100644
index ac23fee..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="annotationCategory" name="Annotation Category" schema="schema/annotationCategory.exsd"/>
-   <extension-point id="annotationDefinition" name="Annotation Definition" schema="schema/annotationDefinition.exsd"/>
-   <extension-point id="annotationInitializer" name="Annotation Initializer" schema="schema/annotationInitializer.exsd"/>
-   <extension-point id="annotationProcessor" name="Annotation Processor" schema="schema/annotationProcessor.exsd"/>
-   
-   <extension point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
-      <factories enableDefault="true">
-         <factory
-            class="org.eclipse.jst.ws.internal.annotations.core.processor.AnnotationsCoreProcessorFactory">
-         </factory>
-      </factories>
-   </extension>
-   
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
deleted file mode 100644
index 9a854be..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationCategory.exsd
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationCategory" name="Annotation Category"/>
-      </appInfo>
-      <documentation>
-         This extension point is used to contribute an annotation category.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="category" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="category">
-      <annotation>
-         <documentation>
-            An annotation category contribution defines categories of annotations used to group them in the UI.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier for the annotation category.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A uniqure annotation cateogory name.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation category contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationCategory&quot;&gt;
-      &lt;category
-            id=&quot;jaxws.category&quot;
-            name=&quot;JAX-WS&quot;&gt;
-      &lt;/category&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;ahref=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
deleted file mode 100644
index b351f26..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationDefinition.exsd
+++ /dev/null
@@ -1,168 +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>
-                  Used to filter java.lang.annotation.ElementType(s) that are specified in the value element of the  @Target annotation on the contributed annotation.
-               </documentation>
-            </annotation>
-            <simpleType>
-               <restriction base="string">
-                  <enumeration value="TYPE">
-                  </enumeration>
-                  <enumeration value="FIELD">
-                  </enumeration>
-                  <enumeration value="METHOD">
-                  </enumeration>
-                  <enumeration value="PARAMETER">
-                  </enumeration>
-                  <enumeration value="CONSTRUCTOR">
-                  </enumeration>
-                  <enumeration value="LOCAL_VARIABLE">
-                  </enumeration>
-                  <enumeration value="ANNOTATION_TYPE">
-                  </enumeration>
-                  <enumeration value="PACKAGE">
-                  </enumeration>
-               </restriction>
-            </simpleType>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation definition contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationDefinition&quot;&gt;
-      &lt;annotation
-            category=&quot;jaxws.category&quot;
-            class=&quot;javax.jws.WebService&quot;
-            name=&quot;WebService&quot;&gt;
-      &lt;/annotation&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
deleted file mode 100644
index c0542a1..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationInitializer.exsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationInitializer" name="Annotation Initializer"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to associate an annotation initializer with a contribute annotation definition.
-
-The annotation initializers role is to construct values for the annotations member value pairs.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="initializer" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="initializer">
-      <complexType>
-         <attribute name="annotation" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class name of the annotation definition that this initializers handles.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that implements the contributed initializer. The
-class must be a public and extend
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer&lt;/code&gt; with a public 0-argument constructor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation initializer contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationInitializer&quot;&gt;
-      &lt;initializer
-            annotation=&quot;javax.jws.WebService&quot;
-            class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer&quot;&gt;
-      &lt;/initializer&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd b/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
deleted file mode 100644
index 8cef659..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/schema/annotationProcessor.exsd
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.annotations.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.annotations.core" id="annotationProcessor" name="Annotation Processor"/>
-      </appInfo>
-      <documentation>
-         This extension point allows clients to contribute annotation procesoors. These processors are associated with contributed annotation definitions.
-
-The goal of the processor is to validate annotation rules.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="processor" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="processor">
-      <complexType>
-         <sequence>
-            <element ref="description" minOccurs="0" maxOccurs="1"/>
-         </sequence>
-         <attribute name="annotation" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the class name of the annotation definition that this processor handles.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.jst.ws.annotations.core.annotationDefinition/annotation/@class"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the name of the class that implements the contributed procesor. The
-class must be a public subclass of
-&lt;code&gt;org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor&lt;/code&gt;and must have a public 0-argument constructor.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="description" type="string">
-      <annotation>
-         <documentation>
-            An optional attribute to hold a short text describing what &quot;rule&quot; the processor handles.
-         </documentation>
-      </annotation>
-   </element>
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         The following is an example of an annotation processor contribution:
-
-&lt;p&gt;
-&lt;pre&gt;
-   &lt;extension point=&quot;org.eclipse.jst.ws.annotations.core.annotationProcessor&quot;&gt;
-      &lt;processor
-            annotation=&quot;javax.jws.WebService&quot;
-            class=&quot;org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIPresentNoWebMethodRule&quot;&gt;
-         &lt;description&gt;
-            %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
-         &lt;/description&gt;
-      &lt;/processor&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-&lt;/p&gt;
-      </documentation>
-   </annotation>
-
-
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2009 Shane Clarke. &lt;br&gt;
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
deleted file mode 100644
index ab1c62c..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationDefinition.java
+++ /dev/null
@@ -1,143 +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.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;
-
-/**
- * 
- * <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>
- * @author sclarke
- */
-public 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 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;
-    
-    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);
-    }
-        
-    public String getName() {
-        return name;
-    }
-    
-    public String getCategory() {
-        return category;
-    }
-    
-    public String getAnnotationClassName() {
-        return annotationClassName;
-    }
-    
-    public boolean isClassOnly() {
-        return classOnly;
-    }
-    
-    public boolean isInterfaceOnly() {
-        return interfaceOnly;
-    }
-    
-    public boolean isEnumOnly() {
-        return enumOnly;
-    }
-    
-    @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;
-    }
-    
-    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 = AnnotationsManager
-                            .getFilteredTargets(configurationElement);
-                    if (targets.containsAll(filteredTargets) && filteredTargets.size() < targets.size()) {
-                        targets.removeAll(filteredTargets);
-                    }
-            	} 
-            }
-        }
-        return targets;
-    }
-    
-    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;
-    }
-}
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 5c2268d..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCore.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-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.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.StringLiteral;
-import org.eclipse.jdt.core.dom.TypeLiteral;
-/**
- * 
- * <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>
- * @author sclarke
- */
-public final class AnnotationsCore {
-
-    private AnnotationsCore() {
-    }
-    
-    public static Annotation createAnnotation(AST ast,
-            Class<? extends java.lang.annotation.Annotation> annotationClass,
-            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;
-    }
-
-    public static MemberValuePair createMemberValuePair(AST ast, String name, Expression expression) {
-        MemberValuePair memberValuePair = ast.newMemberValuePair();
-        memberValuePair.setName(ast.newSimpleName(name));
-        memberValuePair.setValue(expression);
-        return memberValuePair;
-    }
-
-    public static MemberValuePair createStringMemberValuePair(AST ast, String name, Object value) {
-        MemberValuePair stringMemberValuePair = AnnotationsCore.createMemberValuePair(ast, name,
-                AnnotationsCore.createStringLiteral(ast, value.toString()));
-
-        return stringMemberValuePair;
-    }
-
-    public static MemberValuePair createBooleanMemberValuePair(AST ast, String name, Object value) {
-        MemberValuePair booleanValuePair = AnnotationsCore.createMemberValuePair(ast, name, AnnotationsCore
-                .createBooleanLiteral(ast, ((Boolean)value).booleanValue()));
-
-        return booleanValuePair;
-    }
-    
-    public static MemberValuePair createNumberMemberValuePair(AST ast, String name, Object value) {
-        MemberValuePair primitiveValuePair = AnnotationsCore.createMemberValuePair(ast, name, 
-                AnnotationsCore.createNumberLiteral(ast, value.toString()));
-        return primitiveValuePair;
-    }
-    
-    public static MemberValuePair createEnumMemberValuePair(AST ast, String className, String name, 
-            Object value) {
-         return AnnotationsCore.createMemberValuePair(ast, name, createEnumLiteral(ast, className, value));        
-    }
-    
-    public static MemberValuePair createTypeMemberValuePair(AST ast, String name, Object value) {
-        return AnnotationsCore.createMemberValuePair(ast, name,
-                createTypeLiteral(ast, value));
-    }
-    
-    public static MemberValuePair createArrayMemberValuePair(AST ast, Method method, Object[] values) {
-        return AnnotationsCore.createMemberValuePair(ast, method.getName(), createArrayValueLiteral(ast, 
-                method, values));
-     }
-    
-    @SuppressWarnings("unchecked")
-    public static ArrayInitializer createArrayValueLiteral(AST ast, Method method, Object[] values) {
-        ArrayInitializer arrayInitializer = ast.newArrayInitializer();
-        for (Object value : values) {
-            if (value instanceof java.lang.annotation.Annotation) {
-                //TODO Handle this situation. Arises when annotations are specified as defaults in array initializers
-            }
-            if (value instanceof List) {
-                Class<? extends java.lang.annotation.Annotation> annotationClass = 
-                 (Class<? extends java.lang.annotation.Annotation>) method.getReturnType().getComponentType();
-
-                List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-                List<Map<String, Object>> valuesList = (List<Map<String, Object>>) value;
-                Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
-                while (valuesIterator.hasNext()) {
-                    Map<String, Object> annotationMap = (Map<String, Object>) valuesIterator.next();
-                    Set<Entry<String, Object>> entrySet = annotationMap.entrySet();
-                    Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
-                    while (iterator.hasNext()) {
-                        Map.Entry<java.lang.String, Object> entry = iterator.next();
-                        String memberName = entry.getKey();
-                        try {
-                            Method annotationMethod = annotationClass.getMethod(memberName, new Class[0]);
-                            if (annotationMethod != null) {
-                                Object memberValue = entry.getValue();
-                                Class<?> returnType = annotationMethod.getReturnType();
-                                if (returnType.equals(String.class)) {
-                                    memberValuePairs.add(createStringMemberValuePair(ast, memberName,
-                                            memberValue));
-                                }
-                                if (returnType.equals(Boolean.TYPE)) {
-                                    memberValuePairs.add(createBooleanMemberValuePair(ast, memberName,
-                                            memberValue));                                    
-                                }
-                                if (returnType.equals(Class.class)) {
-                                    String className = memberValue.toString();
-                                    if (className.endsWith(".class")) {
-                                        className = className.substring(0, className.lastIndexOf("."));
-                                    }
-                                    memberValuePairs.add(AnnotationsCore.createMemberValuePair(ast, memberName,
-                                            createTypeLiteral(ast, className)));                                    
-                                }
-//                                if (returnType.isPrimitive()) {
-//                                    memberValuePairs.add(getNumberMemberValuePair(ast, memberName, memberValue));
-//                                }
-                            }
-                            
-                        } catch (SecurityException se) {
-                            AnnotationsCorePlugin.log(se);
-                        } catch (NoSuchMethodException nsme) {
-                            AnnotationsCorePlugin.log(nsme);
-                        }
-                    }
-                }
-                arrayInitializer.expressions().add(createAnnotation(ast, annotationClass,
-                        annotationClass.getCanonicalName(), memberValuePairs));
-            }
-            if (value.equals(Class.class)) {
-                arrayInitializer.expressions().add(createTypeLiteral(ast, value.toString()));
-            }
-            if (value instanceof String) {
-                String stringValue = value.toString();
-                if (stringValue.endsWith(".class")) {
-                    arrayInitializer.expressions().add(createTypeLiteral(ast, stringValue.substring(0,
-                            stringValue.lastIndexOf("."))));
-                } else {
-                    arrayInitializer.expressions().add(createStringLiteral(ast, stringValue));
-                }
-            }
-        }
-        return arrayInitializer;
-    }
-    
-    public static Name 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;
-    }
-
-    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;
-    }
-
-    public static TypeLiteral createTypeLiteral(AST ast, Class<?> value) {
-        TypeLiteral typeLiteral = ast.newTypeLiteral();
-
-        Class<?> aClass = (Class<?>)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());
-    }
-
-    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;
-    }
-
-    public static StringLiteral createStringLiteral(AST ast, String literalValue) {
-        StringLiteral stringLiteral = ast.newStringLiteral();
-        stringLiteral.setLiteralValue(literalValue);
-        return stringLiteral;
-    }
-
-    public static BooleanLiteral createBooleanLiteral(AST ast, boolean value) {
-        BooleanLiteral booleanLiteral = ast.newBooleanLiteral(value);
-        return booleanLiteral;
-    }
-    
-    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 84ff919..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsCorePlugin.java
+++ /dev/null
@@ -1,61 +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>
- * @author sclarke
- *
- */
-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 38e40ca..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/AnnotationsManager.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core;
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.ILocalVariable;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-
-/**
- * 
- * <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>
- * @author sclarke
- */
-public final class AnnotationsManager {
-    public static final String ANNOTATION_DEFINITION = "annotationDefinition"; //$NON-NLS-1$
-    public static final String ANNOTATION_CATEGORY = "annotationCategory"; //$NON-NLS-1$
-    public static final String ANNOTATION_INITIALIZER = "annotationInitializer"; //$NON-NLS-1$
-    public static final String ANNOTATION_PROCESSOR = "annotationProcessor"; //$NON-NLS-1$
-    public 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() {
-    }
-    
-    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;
-    }
-
-    public static Object[] getAnnotations(Object element) {
-        List<Class<? extends Annotation>> annotations = new ArrayList<Class<? extends Annotation>>();
-        
-        try {
-            List<AnnotationDefinition> annotationDefinitions = getAllAnnotationsForElement(element);
-        
-            filterAnnotationsList(element, annotationDefinitions);
-        
-            for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-                annotations.add(annotationDefinition.getAnnotationClass());
-            }
-        } catch (JavaModelException jme) {
-            AnnotationsCorePlugin.log(jme.getStatus());
-        }  
-        return annotations.toArray();     
-    }
-    
-    private static synchronized Map<String, AnnotationDefinition> 
-            getAnnotationToClassNameDefinitionMap() {
-            
-        if (annotationClassNameToDefinitionMap == null) {
-            List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
-            annotationClassNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-
-            for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-            	annotationClassNameToDefinitionMap.put(annotationDefinition.getAnnotationClass()
-						.getCanonicalName(), annotationDefinition);
-            }
-        }
-        return annotationClassNameToDefinitionMap;
-    }
-    
-    private static synchronized Map<String, AnnotationDefinition> getSimpleNameToDefinitionMap() {
-        if (annotationSimpleNameToDefinitionMap == null) {
-            List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-
-            annotationSimpleNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-            
-            for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-                annotationSimpleNameToDefinitionMap.put(annotationDefinition.getName(), annotationDefinition);
-            }
-        }
-        return annotationSimpleNameToDefinitionMap;
-    }
-    
-    private static synchronized Map<String, AnnotationDefinition> getQualifiedNameToDefinitionMap() {
-        if (annotationQualifiedNameToDefinitionMap == null) {
-            List<AnnotationDefinition> annotationDefinitions = getAnnotations();
-            
-            annotationQualifiedNameToDefinitionMap = new HashMap<String, AnnotationDefinition>();
-            
-            for (AnnotationDefinition annotationDefinition : annotationDefinitions) {
-                annotationQualifiedNameToDefinitionMap.put(annotationDefinition.getAnnotationClassName(),
-                        annotationDefinition);
-            }
-        }
-        return annotationQualifiedNameToDefinitionMap;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static AnnotationDefinition getAnnotationDefinitionForClass(Object element) {
-        if (element instanceof Class && ((Class<?>)element).isAnnotation()) {
-			return getAnnotationToClassNameDefinitionMap().get(
-					((Class<? extends Annotation>) element).getCanonicalName());
-        }
-        return null;
-    }
-    
-    public static IAnnotationAttributeInitializer getAnnotationAttributeInitializerForName(Name name) {
-        if (name != null) {
-            if (name.isSimpleName()) {
-                return getSimpleNameToDefinitionMap().get(((SimpleName)name).getIdentifier())
-                    .getAnnotationAttributeInitializer();
-            } else if (name.isQualifiedName()) {
-                return getQualifiedNameToDefinitionMap().get(name.getFullyQualifiedName())
-                    .getAnnotationAttributeInitializer();
-            }
-        }
-        return null;
-    }
-    
-    public static AnnotationDefinition getAnnotationDefinitionForClass(Class<? extends Annotation> 
-            annotationClass) {
-        return getAnnotationToClassNameDefinitionMap().get(annotationClass.getCanonicalName());
-    }
-    
-    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);
-    }
-
-    public static List<String> getAnnotationCategories() {
-        return Arrays.asList(getAnnotationCategoryCache().values().toArray(
-                new String[getAnnotationCategoryCache().size()]));
-    }
-
-    public 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;
-    }
-    
-    public static synchronized Map<String, IConfigurationElement> getAnnotationInitializerCache() {
-        if (annotationInitializerCache != null) {
-            return annotationInitializerCache;
-        }
-
-        annotationInitializerCache = new HashMap<String, IConfigurationElement>();
-        
-        IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-                AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_INITIALIZER);
-        if (extensionPoint != null) {
-            IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-            for (int i = 0; i < elements.length; i++) {
-                IConfigurationElement element = elements[i];
-                annotationInitializerCache.put(getAttributeValue(element, ANNOTATION), 
-                        element);
-            }
-        }
-        return annotationInitializerCache;
-    }
-    
-    public static synchronized Map<String, List<IConfigurationElement>> getAnnotationProcessorsCache() {
-        if (annotationProcessorCache == null) {
-            annotationProcessorCache = new HashMap<String, List<IConfigurationElement>>();
-            
-            IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-                    AnnotationsCorePlugin.PLUGIN_ID, ANNOTATION_PROCESSOR);
-            if (extensionPoint != null) {
-                IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
-                for (int i = 0; i < elements.length; i++) {
-                    IConfigurationElement element = elements[i];
-                    if (element.getName().equalsIgnoreCase("processor")) {
-                        String annotationKey = getAttributeValue(element, ANNOTATION);
-                        List<IConfigurationElement> configurationElements = annotationProcessorCache.get(
-                        		annotationKey); 
-                        if (configurationElements == null) {
-                            configurationElements = new ArrayList<IConfigurationElement>();
-                            configurationElements.add(element);
-                            annotationProcessorCache.put(annotationKey, configurationElements);
-                            continue;
-                        }
-                        configurationElements.add(element);
-                    }
-                }
-            }
-        }
-        return annotationProcessorCache;
-    }
-
-    public static String getAttributeValue(IConfigurationElement configurationElement, String attributeName) {
-        String attribute = configurationElement.getAttribute(attributeName);
-        if (attribute != null) {
-            return attribute;
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    public static List<ElementType> getFilteredTargets(IConfigurationElement configurationElement) {
-        List<ElementType> targets = new ArrayList<ElementType>(7);
-        try {
-            IConfigurationElement[] deprecatedTargets = configurationElement.getChildren(ELEM_TARGET_FILTER);
-            for (IConfigurationElement deprecatedTargetElement : deprecatedTargets) {
-                String target = AnnotationsManager.getAttributeValue(deprecatedTargetElement, ATT_TARGET);
-                targets.add(ElementType.valueOf(target));
-            }
-        } catch (IllegalArgumentException iae) {
-            AnnotationsCorePlugin.log(iae);
-        }
-        return targets;
-    }
-
-    private static List<AnnotationDefinition> getAllAnnotationsForElement(Object element) 
-            throws JavaModelException {
-        
-        if (element instanceof IPackageDeclaration) {
-            return getAnnotationsForElementType(ElementType.PACKAGE);
-        }
-        
-        if (element instanceof IType) {
-            IType type = (IType) element;
-            if (type.isAnnotation()) {
-                return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
-            }
-            return getAnnotationsForElementType(ElementType.TYPE);
-        }
-        
-        if (element instanceof IField) {
-            return getAnnotationsForElementType(ElementType.FIELD);
-        }
-        
-        if (element instanceof IMethod) {
-            return getAnnotationsForElementType(ElementType.METHOD);
-        }
-        
-        if (element instanceof SingleVariableDeclaration) {
-            return getAnnotationsForElementType(ElementType.PARAMETER);
-        }
-        
-        if (element instanceof ILocalVariable) {
-            return getAnnotationsForElementType(ElementType.LOCAL_VARIABLE);
-        }
-        
-        if (element instanceof IAnnotation) {
-            return getAnnotationsForElementType(ElementType.ANNOTATION_TYPE);
-        }
-        
-        return Collections.emptyList();
-    }
-    
-    private static List<AnnotationDefinition> getAnnotationsForElementType(ElementType elementType) {
-        List<AnnotationDefinition> annotationDefinitions = new ArrayList<AnnotationDefinition>();
-        
-        if (annotationCache == null) {
-            getAnnotations();
-        }
-        
-        for (AnnotationDefinition annotationDefinition : annotationCache) {
-            if (annotationDefinition.getTargets().contains(elementType) && 
-                    !isDeprecated(annotationDefinition)) {
-                annotationDefinitions.add(annotationDefinition);
-            }
-        }
-        return annotationDefinitions;
-    }
-    
-    private static void filterAnnotationsList(Object element, 
-        List<AnnotationDefinition> annotationDefinitions) throws JavaModelException {
-        Iterator<AnnotationDefinition> annotationIter = annotationDefinitions.iterator();
-        while (annotationIter.hasNext()) {
-            AnnotationDefinition annotationDefinition = annotationIter.next();
-            
-            if (element instanceof IType) {
-                IType type = (IType) element;
-                if (isClassRestricted(type, annotationDefinition)
-                        || isInterfaceRestricted(type, annotationDefinition)
-                        || isEnumRestricted(type, annotationDefinition)) {
-                    annotationIter.remove();
-                }
-            }
-            if (element instanceof IMethod) {
-                IMethod method = (IMethod) element;
-                if (method.isMainMethod()) {
-                    annotationIter.remove();
-                }
-                if (method.isConstructor()
-                        && !annotationDefinition.getTargets().contains(ElementType.CONSTRUCTOR)) {
-                    annotationIter.remove();
-                }
-
-                if (isClassRestricted(method, annotationDefinition)
-                        || isInterfaceRestricted(method, annotationDefinition)
-                        || isEnumRestricted(method, annotationDefinition)) {
-                    annotationIter.remove();
-                }
-            }
-            
-            if (element instanceof IField) {
-                if(isClassRestricted((IField) element, annotationDefinition)
-                        || isInterfaceRestricted((IField) element, annotationDefinition)
-                        ||isEnumRestricted((IField) element, annotationDefinition)) {
-                    annotationIter.remove();
-                }
-            }
-        }
-    }
-    
-    private static boolean isClassRestricted(IJavaElement javaElement,
-    		AnnotationDefinition annotationDefinition) throws JavaModelException {
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            return !((IType)javaElement).isClass() && annotationDefinition.isClassOnly();
-        }
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isClass() && annotationDefinition.isClassOnly();
-        }
-        if (javaElement.getElementType() == IJavaElement.FIELD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isClass() && annotationDefinition.isClassOnly();
-        }
-        return false;
-    }
-    
-    private static boolean isInterfaceRestricted(IJavaElement javaElement,
-    		AnnotationDefinition annotationDefinition) throws JavaModelException {
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            return !((IType)javaElement).isInterface() && annotationDefinition.isInterfaceOnly();
-        }
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isInterface()  && annotationDefinition.isInterfaceOnly();
-        }
-        if (javaElement.getElementType() == IJavaElement.FIELD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isInterface() && annotationDefinition.isInterfaceOnly();
-        }
-        return false;
-    }
-    
-    private static boolean isEnumRestricted(IJavaElement javaElement,
-    		AnnotationDefinition annotationDefinition) throws JavaModelException {
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            return !((IType)javaElement).isEnum() && annotationDefinition.isEnumOnly();            
-        }
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isEnum() && annotationDefinition.isEnumOnly();            
-        }
-        if (javaElement.getElementType() == IJavaElement.FIELD) {
-            IType type = (IType)javaElement.getParent();
-            return !type.isEnum() && annotationDefinition.isEnumOnly();            
-        }
-        return false;
-    }
-    
-    //TODO Move the Deprecated option to preferences
-    private static boolean isDeprecated(AnnotationDefinition annotationDefinition) {
-        Class<?> annotationClass = annotationDefinition.getAnnotationClass();
-        return annotationClass.getAnnotation(java.lang.Deprecated.class) != null;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
deleted file mode 100644
index da79db0..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/AnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,59 +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.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Base class for initializers contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationInitializer</code> extension point.
- * <p>
- * 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>
- * @author sclarke
- * 
-*/
-public class AnnotationAttributeInitializer implements IAnnotationAttributeInitializer {
-
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        return Collections.emptyList();
-    }
-
-    public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        return Collections.emptyList();
-    }
-
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-        return Collections.emptyList();
-    }
-
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
-            MemberValuePair memberValuePair) {
-        return Collections.emptyList();
-    }
-}
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 20a771b..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/DefaultsAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,97 +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.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-/**
- * Constructs <code>MemberValuePair</code> from the defaults found in the passed in <code>Annotation</code>.
- * <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>
- * @author sclarke
- */
-public class DefaultsAnnotationAttributeInitializer extends AnnotationAttributeInitializer {
-    
-    public DefaultsAnnotationAttributeInitializer() {
-        
-    }
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        return getMemberValuePairs(ast, annotationClass);
-    }
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, 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));
-                }
-                
-                if (returnType.isArray()) {
-                    memberValuePairs.add(AnnotationsCore.createArrayMemberValuePair(ast, method, 
-                            (Object[])defaultValue));
-                }
-                
-                if (returnType.isEnum()) {
-                    memberValuePairs.add(AnnotationsCore.createEnumMemberValuePair(ast, 
-                            method.getDeclaringClass().getCanonicalName(), name, defaultValue));
-                }
-                
-                if (returnType.equals(Class.class)) {
-                    memberValuePairs.add(AnnotationsCore.createTypeMemberValuePair(ast, name, 
-                            defaultValue));
-                }
-            }
-        }      
-        return memberValuePairs;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
deleted file mode 100644
index b64f785..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/initialization/IAnnotationAttributeInitializer.java
+++ /dev/null
@@ -1,44 +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.ASTNode;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * 
- * <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>
- * @author sclarke
- */
-public interface IAnnotationAttributeInitializer {  
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends java.lang.annotation.Annotation> annotationClass);
-    
-    public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
-            Class<? extends java.lang.annotation.Annotation> annotationClass);
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair);
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
-            MemberValuePair memberValuePair);
-    
-}
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 8608f40..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/processor/AbstractAnnotationProcessor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.annotations.core.processor;
-
-import java.util.Collection;
-
-import org.eclipse.jdt.apt.core.util.EclipseMessager;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.util.SourcePosition;
-
-/**
- * Abstract base class for processors contributed to the
- * <code>org.eclipse.jst.ws.annotations.core.annotationProcessor</code> extension point.
- *
- * <p>
- * <strong>Provisional API:</strong> This class/interface is part of an interim API that is still under 
- * development and expected to change significantly before reaching stability. It is being made available at 
- * this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses 
- * this API will almost certainly be broken (repeatedly) as the API evolves.
- * </p>
- * @author sclarke
- * 
- */
-public abstract class AbstractAnnotationProcessor implements AnnotationProcessor {
-    protected AnnotationProcessorEnvironment environment;
-    
-    public void setAnnotationProcessorEnvironment(AnnotationProcessorEnvironment environment) {
-        this.environment = environment;
-    }
-    
-    public abstract void process();
-    
-    protected void printError(AnnotationTypeDeclaration annotationDeclaration ,
-            MethodDeclaration methodDeclaration, String errorMessage) {
-
-        Collection<AnnotationMirror> annotationMirrors = methodDeclaration.getAnnotationMirrors();
-        for (AnnotationMirror mirror : annotationMirrors) {
-            if (mirror.getAnnotationType().toString().equals(annotationDeclaration.getQualifiedName())) {
-                environment.getMessager().printError(mirror.getPosition(), errorMessage); 
-            }
-        }
-    }
-    
-    protected void printError(SourcePosition position, String message) {
-        environment.getMessager().printError(position, message);        
-    }
-    
-    protected void printError(String message) {
-        environment.getMessager().printError(message);        
-    }
-
-    protected void printWarning(SourcePosition position, String message) {
-        environment.getMessager().printWarning(position, message);        
-    }
-    
-    protected void printWarning(String message) {
-        environment.getMessager().printWarning(message);        
-    }
-
-    protected void printNotice(SourcePosition position, String message) {
-        environment.getMessager().printNotice(position, message);        
-    }
-    
-    protected void printNotice(String message) {
-        environment.getMessager().printNotice(message);        
-    }
-
-    protected void printFixableError(SourcePosition position, String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableError(position, message, pluginId, errorId);
-    }
-
-    protected void printFixableError(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableError(message, pluginId, errorId);
-    }
-
-    protected void printFixableWarning(SourcePosition position, String message, String pluginId,
-            String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableWarning(position, message, pluginId, errorId);
-    }
-    
-    protected void printFixableWarning(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableWarning(message, pluginId, errorId);
-    }
-
-
-    protected void printFixableNotice(SourcePosition position, String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableNotice(position, message, pluginId, errorId);
-    }
-    
-    protected void printFixableNotice(String message, String pluginId, String errorId) {
-        EclipseMessager messager = (EclipseMessager) environment.getMessager();
-        messager.printFixableNotice(message, pluginId, errorId);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
deleted file mode 100644
index 9d93f02..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/annotations/core/utils/AnnotationUtils.java
+++ /dev/null
@@ -1,1355 +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.annotations.core.utils;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.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.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-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.AnnotationTypeMemberDeclaration;
-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.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.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.TextEditGroup;
-
-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>
- * @author sclarke
- */
-public final class AnnotationUtils {
-    private static final String FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR 
-            = "org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator"; //$NON-NLS-1$
-    private static final String FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR 
-            = "org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator"; //$NON-NLS-1$
-    private static final String DO_NOT_INSERT 
-            = "do not insert"; //$NON-NLS-1$
-
-    private AnnotationUtils() {
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void addImportChange(CompilationUnit compilationUnit, 
-            Class<? extends java.lang.annotation.Annotation> annotation, TextFileChange textFileChange, 
-            boolean annotate) throws CoreException {
-        String qualifiedName = annotation.getCanonicalName();
-        ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-
-        if (annotate) {
-            importRewrite.addImport(qualifiedName);
-        } else {
-            final String annotationSimpleName = annotation.getSimpleName();
-            final List<String> occurences = new ArrayList<String>();
-            Target target = annotation.getAnnotation(Target.class);
-            List<ElementType> elementTypes = Arrays.asList(target.value());
-            for (ElementType elementType : elementTypes) {
-                // TODO Handle package annotation imports
-                if (elementType == ElementType.TYPE) {
-                    compilationUnit.accept(new ASTVisitor() {
-                        @Override
-                        public boolean visit(TypeDeclaration typeDeclaration) {
-                            countAnnotationOccurrences(typeDeclaration.modifiers(), annotationSimpleName,
-                                    occurences);
-                            return super.visit(typeDeclaration);
-                        }
-                    });
-                }
-                if (elementType == ElementType.FIELD) {
-                    compilationUnit.accept(new ASTVisitor() {
-                        @Override
-                        public boolean visit(FieldDeclaration fieldDeclaration) {
-                            countAnnotationOccurrences(fieldDeclaration.modifiers(), annotationSimpleName,
-                                    occurences);
-                            return super.visit(fieldDeclaration);
-                        }
-                    });
-                }
-                if (elementType == ElementType.METHOD) {
-                    compilationUnit.accept(new ASTVisitor() {
-                        @Override
-                        public boolean visit(MethodDeclaration methodDeclaration) {
-                            countAnnotationOccurrences(methodDeclaration.modifiers(), annotationSimpleName,
-                                    occurences);
-                            return super.visit(methodDeclaration);
-                        }
-                    });
-                }
-                if (elementType == ElementType.PARAMETER) {
-                    compilationUnit.accept(new ASTVisitor() {
-                        @Override
-                        public boolean visit(SingleVariableDeclaration singleVariableDeclaration) {
-                            countAnnotationOccurrences(singleVariableDeclaration.modifiers(),
-                                    annotationSimpleName, occurences);
-                            return super.visit(singleVariableDeclaration);
-                        }
-                    });
-                }
-            }
-            if (occurences.size() == 1) {
-                importRewrite.removeImport(qualifiedName);
-            }
-        }
-        if (importRewrite.hasRecordedChanges()) {
-            // TODO Cleanup imports
-            // Repeatedly adding and removing an import where none existed
-            // before will
-            // insert a new line on each insert.
-            TextEdit importTextEdit = importRewrite.rewriteImports(null);
-            textFileChange.addEdit(importTextEdit);
-        }
-    }
-    
-    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);
-                }
-            }
-        }
-    }
-
-    public static void createPackageDeclarationAnnotationChange(ICompilationUnit source, 
-            PackageDeclaration packageDeclaration, ASTRewrite rewriter, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        IProgressMonitor monitor = new NullProgressMonitor();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        try {
-            if (packageDeclaration != null && !isAnnotationPresent(packageDeclaration, annotation)) {
-                bufferManager.connect(path, LocationKind.IFILE, monitor);
-                connected = true;
-                IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-                ListRewrite listRewrite = rewriter.getListRewrite(packageDeclaration,
-                        PackageDeclaration.ANNOTATIONS_PROPERTY);
-
-                listRewrite.insertFirst(annotation, null);
-
-                TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                textFileChange.addEdit(annotationTextEdit);
-
-                textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                        TextEdit[] { annotationTextEdit }));
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, monitor);
-            }
-        }
-    }
-    
-    public static void removeAnnotationFromPackageDeclaration(ICompilationUnit source,
-            PackageDeclaration packageDeclaration, ASTRewrite rewriter, Annotation annotation,
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            if (packageDeclaration != null && isAnnotationPresent(packageDeclaration, annotation)) {
-                bufferManager.connect(path, LocationKind.IFILE, null);
-                connected = true;
-                IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-                ListRewrite listRewrite = rewriter.getListRewrite(packageDeclaration,
-                        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);
-                    }
-                }
-
-                TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                textFileChange.addEdit(annotationTextEdit);
-
-                textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                        TextEdit[] { annotationTextEdit }));
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void createTypeAnnotationChange(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IType type, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            @SuppressWarnings("unchecked")
-            List<TypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)
-                        && !isAnnotationPresent(abstractTypeDeclaration, annotation)) {
-                    bufferManager.connect(path, LocationKind.IFILE, null);
-                    connected = true;
-                    IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                            .getDocument();
-
-                    ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
-                            getChildListPropertyDescriptorForType(abstractTypeDeclaration));
-                    
-                    listRewrite.insertFirst(annotation, null);
-
-                    TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                    textFileChange.addEdit(annotationTextEdit);
-
-                    textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                            TextEdit[] { annotationTextEdit }));
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-
-    public static void removeAnnotationFromType(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IType type, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            @SuppressWarnings("unchecked")
-            List<TypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type) 
-                        && isAnnotationPresent(abstractTypeDeclaration, annotation)) {
-                    bufferManager.connect(path, LocationKind.IFILE, null);
-                    connected = true;
-
-                    IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                            .getDocument();
-
-                    ListRewrite listRewrite = rewriter.getListRewrite(abstractTypeDeclaration,
-                            getChildListPropertyDescriptorForType(abstractTypeDeclaration));
-
-                    @SuppressWarnings("unchecked")
-                    List originalList = listRewrite.getOriginalList();
-                    for (Object object : originalList) {
-                        if (object instanceof Annotation && compareAnnotationNames((Annotation)object, 
-                                annotation)) {
-                            listRewrite.remove((Annotation)object, null);
-                        }
-                    }
-                    
-                    TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-                     
-                    textFileChange.addEdit(annotationTextEdit);
-
-                    textFileChange.addTextEditGroup(new TextEditGroup("AA", new  //$NON-NLS-1$
-                             TextEdit[] {annotationTextEdit}));
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void createMethodAnnotationChange(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IMethod method, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            IType type = method.getDeclaringType();
-            @SuppressWarnings("unchecked")
-            List<AbstractTypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)) {
-                    List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
-                            abstractTypeDeclaration);
-                    BodyDeclaration bodyDeclaration = getMethodDeclaration(bodyDeclarations, method);
-                    if (!isAnnotationPresent(bodyDeclaration, annotation)) {
-                        bufferManager.connect(path, LocationKind.IFILE, null);
-                        connected = true;
-
-                        IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                .getDocument();
-                        
-                        ListRewrite listRewrite = rewriter.getListRewrite(bodyDeclaration,
-                                getChildListPropertyDescriptorForMethod(bodyDeclaration));
-                        listRewrite.insertAt(annotation, 0, null);
-
-                        TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                        textFileChange.addEdit(annotationTextEdit);
-                        textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                TextEdit[] { annotationTextEdit }));
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void removeAnnotationFromMethod(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IMethod method, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            IType type = method.getDeclaringType();
-            @SuppressWarnings("unchecked")
-            List<AbstractTypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)) {
-                    List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
-                            abstractTypeDeclaration);
-                    BodyDeclaration bodyDeclaration = getMethodDeclaration(bodyDeclarations, method);
-                    if (isAnnotationPresent(bodyDeclaration, annotation)) {
-                        bufferManager.connect(path, LocationKind.IFILE, null);
-                        connected = true;
-
-                        IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                .getDocument();
-
-                        ListRewrite listRewrite = rewriter.getListRewrite(bodyDeclaration,
-                                getChildListPropertyDescriptorForMethod(bodyDeclaration));
-
-                        @SuppressWarnings("unchecked")
-                        List originalList = listRewrite.getOriginalList();
-                        for (Object object : originalList) {
-                            if (object instanceof Annotation
-                                    && compareAnnotationNames((Annotation) object, annotation)) {
-                                listRewrite.remove((Annotation) object, null);
-                            }
-                        }
-
-                        TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                        textFileChange.addEdit(annotationTextEdit);
-                        textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                TextEdit[] { annotationTextEdit }));
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-
-    public static void createFieldAnnotationChange(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IField field, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            IType type = field.getDeclaringType();
-            @SuppressWarnings("unchecked")
-            List<AbstractTypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)) {
-                    List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
-                            abstractTypeDeclaration);
-                    FieldDeclaration fieldDeclaration = (FieldDeclaration) getFieldDeclaration(
-                            bodyDeclarations, field);
-                    if (!isAnnotationPresent(fieldDeclaration, annotation)) {
-                        bufferManager.connect(path, LocationKind.IFILE, null);
-                        connected = true;
-
-                        IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                .getDocument();
-
-                        ListRewrite listRewrite = rewriter.getListRewrite(fieldDeclaration,
-                                FieldDeclaration.MODIFIERS2_PROPERTY);
-                        listRewrite.insertAt(annotation, 0, null);
-
-                        TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                        textFileChange.addEdit(annotationTextEdit);
-                        textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                TextEdit[] { annotationTextEdit }));
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void removeAnnotationFromField(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, IField field, Annotation annotation, 
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            IType type = field.getDeclaringType();
-            @SuppressWarnings("unchecked")
-            List<AbstractTypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)) {
-                    List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(
-                            abstractTypeDeclaration);
-                    FieldDeclaration fieldDeclaration = (FieldDeclaration) getFieldDeclaration(
-                            bodyDeclarations, field);
-
-                    if (isAnnotationPresent(fieldDeclaration, annotation)) {
-                        bufferManager.connect(path, LocationKind.IFILE, null);
-                        connected = true;
-
-                        IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                .getDocument();
-
-                        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);
-                            }
-                        }
-
-                        TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                        textFileChange.addEdit(annotationTextEdit);
-                        textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                TextEdit[] { annotationTextEdit }));
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-   
-    public static void createMethodParameterAnnotationChange(ICompilationUnit source, CompilationUnit 
-            compilationUnit, ASTRewrite rewriter, SingleVariableDeclaration singleVariableDeclaration, 
-            IMethod method, Annotation annotation, TextFileChange textFileChange) throws CoreException {
-
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            IType type = method.getDeclaringType();
-            @SuppressWarnings("unchecked")
-            List<AbstractTypeDeclaration> types = compilationUnit.types();
-            for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-                if (compareTypeNames(abstractTypeDeclaration, type)) {
-                    List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
-                    MethodDeclaration methodDeclaration = (MethodDeclaration) getMethodDeclaration(
-                            bodyDeclarations, method);
-
-                    @SuppressWarnings("unchecked")
-                    List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
-                    for (SingleVariableDeclaration parameter : parameters) {
-                        if (compareMethodParameters(parameter, singleVariableDeclaration)
-                                && !isAnnotationPresent(parameter, annotation)) {
-                            bufferManager.connect(path, LocationKind.IFILE, null);
-                            connected = true;
-
-                            IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                    .getDocument();
-
-                            ListRewrite listRewrite = rewriter.getListRewrite(parameter,
-                                    SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
-                            listRewrite.insertAt(annotation, -1, null);
-
-                            TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                            textFileChange.addEdit(annotationTextEdit);
-
-                            textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                    TextEdit[] { annotationTextEdit }));
-                        }
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }        
-    }
-    
-    public static void createMethodParameterAnnotationChange(ICompilationUnit source, ASTRewrite rewriter,
-            SingleVariableDeclaration singleVariableDeclaration, Annotation annotation,
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            if (!isAnnotationPresent(singleVariableDeclaration, annotation)) {
-                bufferManager.connect(path, LocationKind.IFILE, null);
-                connected = true;
-
-                IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-                ListRewrite listRewrite = rewriter.getListRewrite(singleVariableDeclaration,
-                        SingleVariableDeclaration.MODIFIERS2_PROPERTY);
-
-                listRewrite.insertAt(annotation, -1, null);
-
-                TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                textFileChange.addEdit(annotationTextEdit);
-
-                textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                        TextEdit[] { annotationTextEdit }));
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void removeAnnotationFromMethodParameter(ICompilationUnit source, ASTRewrite rewriter,
-            SingleVariableDeclaration singleVariableDeclaration, Annotation annotation,
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            if (isAnnotationPresent(singleVariableDeclaration, annotation)) {
-                bufferManager.connect(path, LocationKind.IFILE, null);
-                connected = true;
-
-                IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-                ListRewrite listRewrite = rewriter.getListRewrite(singleVariableDeclaration,
-                        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);
-                    }
-                }
-
-                TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                textFileChange.addEdit(annotationTextEdit);
-
-                textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                        TextEdit[] { annotationTextEdit }));
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-
-    public static void createMemberValuePairChange(ICompilationUnit source, CompilationUnit compilationUnit,
-            ASTRewrite rewriter, IJavaElement javaElement, IAnnotation annotation, ASTNode memberValuePair,
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
-            for (IExtendedModifier extendedModifier : modifiers) {
-                if (extendedModifier instanceof NormalAnnotation) {
-                    NormalAnnotation existingAnnotation = (NormalAnnotation) extendedModifier;
-                    if (AnnotationUtils.compareAnnotationNames(annotation, existingAnnotation)) {
-                        bufferManager.connect(path, LocationKind.IFILE, null);
-                        connected = true;
-
-                        IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE)
-                                .getDocument();
-
-                        ListRewrite listRewrite = rewriter.getListRewrite(existingAnnotation,
-                                NormalAnnotation.VALUES_PROPERTY);
-
-                        listRewrite.insertLast(memberValuePair, null);
-
-                        TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-                        textFileChange.addEdit(annotationTextEdit);
-
-                        textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                TextEdit[] { annotationTextEdit }));
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    public static void createMemberValuePairChange(ICompilationUnit source, CompilationUnit compilationUnit,
-            ASTRewrite rewriter, NormalAnnotation annotation, ASTNode memberValuePair,
-            TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            bufferManager.connect(path, LocationKind.IFILE, null);
-            connected = true;
-
-            IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-            ListRewrite listRewrite = rewriter.getListRewrite(annotation,
-                    NormalAnnotation.VALUES_PROPERTY);
-
-            listRewrite.insertLast(memberValuePair, null);
-
-            TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-            textFileChange.addEdit(annotationTextEdit);
-
-            textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                    TextEdit[] { annotationTextEdit }));
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-
-    public static void updateMemberValuePairValue(ICompilationUnit source, CompilationUnit compilationUnit,
-            ASTRewrite rewriter, IJavaElement javaElement, IAnnotation annotation, IMemberValuePair memberValuePair,
-            ASTNode value, TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
-            for (IExtendedModifier extendedModifier : modifiers) {
-                if (extendedModifier instanceof NormalAnnotation) {
-                    NormalAnnotation existingAnnotation = (NormalAnnotation) extendedModifier;
-                    if (AnnotationUtils.compareAnnotationNames(annotation, existingAnnotation)) {
-                        @SuppressWarnings("unchecked")
-                        List<MemberValuePair> memberValuePairs = existingAnnotation.values();
-                        for (MemberValuePair memberValuePairDOM : memberValuePairs) {
-                            if (memberValuePairDOM.getName().toString().equals(
-                                    memberValuePair.getMemberName())) {
-                                bufferManager.connect(path, LocationKind.IFILE, null);
-                                connected = true;
-
-                                IDocument document = bufferManager
-                                        .getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-                                rewriter.set(memberValuePairDOM, MemberValuePair.VALUE_PROPERTY, value, null);
-
-                                TextEdit annotationTextEdit = rewriter.rewriteAST(document,
-                                        getOptions(source));
-
-                                textFileChange.addEdit(annotationTextEdit);
-
-                                textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                                        TextEdit[] { annotationTextEdit }));
-                            }
-                        }
-                    }
-                }
-            }
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-
-    public static void updateMemberValuePairValue(ICompilationUnit source, CompilationUnit compilationUnit,
-            ASTRewrite rewriter, NormalAnnotation annotation, MemberValuePair memberValuePair,
-            ASTNode value, TextFileChange textFileChange) throws CoreException {
-        ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-        IPath path = source.getResource().getFullPath();
-        boolean connected = false;
-        try {
-            bufferManager.connect(path, LocationKind.IFILE, null);
-            connected = true;
-
-            IDocument document = bufferManager.getTextFileBuffer(path, LocationKind.IFILE).getDocument();
-
-            rewriter.set(memberValuePair, MemberValuePair.VALUE_PROPERTY, value, null);
-
-            TextEdit annotationTextEdit = rewriter.rewriteAST(document, getOptions(source));
-
-            textFileChange.addEdit(annotationTextEdit);
-
-            textFileChange.addTextEditGroup(new TextEditGroup("AA", new //$NON-NLS-1$
-                    TextEdit[] { annotationTextEdit }));
-        } finally {
-            if (connected) {
-                bufferManager.disconnect(path, LocationKind.IFILE, null);
-            }
-        }
-    }
-    
-    @SuppressWarnings("unchecked")
-    private static Map getOptions(ICompilationUnit source) {
-        Map options = source.getJavaProject().getOptions(true);
-        options.put(FORMATTER_INSERT_SPACE_BEFORE_ASSIGNMENT_OPERATOR, DO_NOT_INSERT);
-        options.put(FORMATTER_INSERT_SPACE_AFTER_ASSIGNMENT_OPERATOR, DO_NOT_INSERT);
-        return options;
-    }
-    
-    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;
-    }
-
-    private static ChildListPropertyDescriptor getChildListPropertyDescriptorForMethod(
-            BodyDeclaration bodyDeclaration) {
-        if (bodyDeclaration instanceof MethodDeclaration) {
-            return MethodDeclaration.MODIFIERS2_PROPERTY;
-        }
-        if (bodyDeclaration instanceof AnnotationTypeMemberDeclaration) {
-            return AnnotationTypeMemberDeclaration.MODIFIERS2_PROPERTY;
-        }
-        return null;
-    }
-
-    public static CompilationUnit getASTParser(ICompilationUnit source) {
-        ASTParser parser = ASTParser.newParser(AST.JLS3);
-        parser.setSource(source);
-        CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(new NullProgressMonitor());
-        compilationUnit.recordModifications();
-        return compilationUnit;
-    }
-    
-    public static TextFileChange createTextFileChange(String textFileChangeName, IFile file) {
-        TextFileChange textFileChange = new TextFileChange(textFileChangeName, file);
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-        return textFileChange;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static List<SingleVariableDeclaration> getMethodParameters(IType type, final IMethod method) {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = getASTParser(source);
-        final List<SingleVariableDeclaration> parameters = new ArrayList();
-        compilationUnit.accept(new ASTVisitor() {
-            @Override
-            public boolean visit(MethodDeclaration methodDeclaration) {
-                if (compareMethods(methodDeclaration, method)) {
-                    parameters.addAll(methodDeclaration.parameters());
-                }
-                return super.visit(methodDeclaration);
-            }
-        });     
-        return parameters;
-    }
-
-    public static String getAnnotationName(Annotation annotation) {
-        Name annotationTypeName = annotation.getTypeName();
-        return annotationTypeName.getFullyQualifiedName();
-    }
-    
-    public static boolean compareTypeNames(AbstractTypeDeclaration abstractTypeDeclaration, IType type) {
-        return abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName());
-    }
-    
-    @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;
-	}
-
-    public static boolean compareMethods(com.sun.mirror.declaration.MethodDeclaration methodOne,
-            com.sun.mirror.declaration.MethodDeclaration methodTwo) {
-        return compareMethodNames(methodOne, methodTwo) && compareMethodReturnTypes(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 compareMethodReturnTypes(com.sun.mirror.declaration.MethodDeclaration methodOne,
-            com.sun.mirror.declaration.MethodDeclaration methodTwo) {
-        return methodOne.getReturnType().equals(methodTwo.getReturnType());
-
-    }
-
-    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;
-    }
-     
-    public static boolean compareMethodNames(AnnotationTypeMemberDeclaration memmberDeclaration, IMethod method) {
-        if (memmberDeclaration.getName().getIdentifier().equals(method.getElementName())) {
-                return true;
-        }
-        return false;
-    }
-    
-    @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;
-    }
-
-    public static String accountForOverloadedMethods(IType type, IMethod method) throws JavaModelException {
-    	List<IMethod> methods =  Arrays.asList(type.getMethods());
-    	List<IMethod> similarMethods = new ArrayList<IMethod>();
-    	for (IMethod methodToTest : methods) {
-    		if (!method.equals(methodToTest) && method.getElementName().equalsIgnoreCase(
-    				methodToTest.getElementName()) && methodToTest.getSourceRange().getOffset() < 
-    				method.getSourceRange().getOffset()) {
-    			similarMethods.add(methodToTest);
-			}
-		}
-    	return similarMethods.size() > 0 ? Integer.toString(similarMethods.size()) : ""; //$NON-NLS-1$
-    }
-    
-    private static boolean compareAnnotationNames(Annotation newAnnotation, Annotation existingAnnotation) {
-        return AnnotationUtils.getAnnotationName(existingAnnotation).equals(
-                AnnotationUtils.getAnnotationName(newAnnotation));
-    }
-    
-    private static boolean compareAnnotationNames(IAnnotation newAnnotation, Annotation existingAnnotation) {
-        return AnnotationUtils.getAnnotationName(existingAnnotation).equals(newAnnotation.getElementName());
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static boolean isAnnotationPresent(SingleVariableDeclaration parameter, String annotationName) {
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation existingAnnotation = (Annotation) extendedModifier;
-                if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static boolean isAnnotationPresent(SingleVariableDeclaration parameter,
-            Annotation annatotationToAdd) {
-        boolean exists = false;
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation existingAnnotation = (Annotation) extendedModifier;
-                if (compareAnnotationNames(annatotationToAdd, existingAnnotation)) {
-                    return true;
-                }
-            }
-        }
-        return exists;
-    }
-    
-    public static boolean isAnnotationPresent(IJavaElement javaElement, String annotationName) {
-        if (javaElement.getElementType() == IJavaElement.COMPILATION_UNIT) {
-            return isAnnotationPresent(((ICompilationUnit)javaElement).findPrimaryType(), annotationName);
-        }
-        
-        ICompilationUnit source = ((IMember)javaElement).getCompilationUnit();
-        
-        int elementType = javaElement.getElementType();
-        CompilationUnit compilationUnit = getASTParser(source);
-        if (elementType == IJavaElement.PACKAGE_DECLARATION) {
-            return isAnnotationPresent(compilationUnit.getPackage(), annotationName);
-        }
-        if (elementType == IJavaElement.TYPE || elementType == IJavaElement.METHOD || 
-                elementType == IJavaElement.FIELD) {
-            return isAnnotationPresent(compilationUnit, javaElement, annotationName);
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static boolean isAnnotationPresent(PackageDeclaration packageDeclaration, String annotationName) {
-        List<Annotation> annotations = packageDeclaration.annotations();
-        for (Annotation existingAnnotation : annotations) {
-            if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static boolean isAnnotationPresent(PackageDeclaration packageDeclaration, Annotation annotation) {
-        List<Annotation> annotations = packageDeclaration.annotations();
-        for (Annotation existingAnnotation : annotations) {
-            if (compareAnnotationNames(annotation, existingAnnotation)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private static boolean isAnnotationPresent(BodyDeclaration bodyDeclaration, Annotation annatotationToAdd) {
-        boolean exists = false;
-        List<IExtendedModifier> modifiers = bodyDeclaration.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation existingAnnotation = (Annotation) extendedModifier;
-                if (compareAnnotationNames(annatotationToAdd, existingAnnotation)) {
-                    return true;
-                }
-            }
-        }
-        return exists;
-    }
-
-    private static boolean isAnnotationPresent(CompilationUnit compilationUnit, IJavaElement javaElement,
-            String annotationName) {
-        List<IExtendedModifier> modifiers = getExtendedModifiers(compilationUnit, javaElement);
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier.isAnnotation()) {
-                Annotation existingAnnotation = (Annotation) extendedModifier;
-                if (AnnotationUtils.getAnnotationName(existingAnnotation).equals(annotationName)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static List<IExtendedModifier> getExtendedModifiers(CompilationUnit compilationUnit, 
-            IJavaElement javaElement) {
-        IType type = compilationUnit.getTypeRoot().findPrimaryType();
-        List<AbstractTypeDeclaration> types = compilationUnit.types();
-        for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-            if (compareTypeNames(abstractTypeDeclaration, type)) {
-                List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
-                
-                BodyDeclaration bodyDeclaration = null;
-                if (javaElement.getElementType() == IJavaElement.TYPE) {
-                    bodyDeclaration = abstractTypeDeclaration;
-                }
-                
-                if (javaElement.getElementType() == IJavaElement.METHOD) {
-                    bodyDeclaration = getMethodDeclaration(bodyDeclarations, (IMethod) javaElement);
-                }
-                if (javaElement.getElementType() == IJavaElement.FIELD) {
-                    bodyDeclaration = getFieldDeclaration(bodyDeclarations, (IField) javaElement);
-                }
-
-                return bodyDeclaration != null ? bodyDeclaration.modifiers() : Collections.emptyList();
-            }
-        }
-        return Collections.emptyList();
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static List<BodyDeclaration> getBodyDeclarationsForType(
-            AbstractTypeDeclaration abstractTypeDeclaration) {
-        if (abstractTypeDeclaration instanceof TypeDeclaration) {
-            TypeDeclaration typeDeclaration = (TypeDeclaration) abstractTypeDeclaration;
-            return typeDeclaration.bodyDeclarations();
-        }
-        if (abstractTypeDeclaration instanceof EnumDeclaration) {
-            EnumDeclaration enumDeclaration = (EnumDeclaration) abstractTypeDeclaration;
-            return enumDeclaration.bodyDeclarations();
-        }
-        if (abstractTypeDeclaration instanceof AnnotationTypeDeclaration) {
-            AnnotationTypeDeclaration annotationTypeDeclaration = 
-                (AnnotationTypeDeclaration) abstractTypeDeclaration;
-            return annotationTypeDeclaration.bodyDeclarations();
-        }
-        return Collections.emptyList();
-    }
-    
-    private static BodyDeclaration getMethodDeclaration(List<BodyDeclaration> bodyDeclarations, 
-            IMethod method) {
-        for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
-            if (bodyDeclaration instanceof MethodDeclaration) {
-                if (compareMethods((MethodDeclaration)bodyDeclaration, method)) {
-                    return bodyDeclaration;
-                }
-            }
-            if (bodyDeclaration instanceof AnnotationTypeMemberDeclaration) {
-                if (compareMethodNames((AnnotationTypeMemberDeclaration)bodyDeclaration, method)) {
-                    return bodyDeclaration;
-                }
-            }
-        }
-        return null;
-    }
-
-    private static BodyDeclaration getFieldDeclaration(List<BodyDeclaration> bodyDeclarations, IField field) {
-        for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
-            if (bodyDeclaration instanceof FieldDeclaration) {
-                if (compareFieldNames((FieldDeclaration)bodyDeclaration, field)) {
-                    return bodyDeclaration;
-                }
-            }
-        }
-        return null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static SingleVariableDeclaration getMethodParameter(CompilationUnit compilationUnit, 
-                IMethod method, int offset) {
-        if (compilationUnit == null) {
-          compilationUnit = getASTParser(method.getCompilationUnit());                
-        }
-        IType type = method.getDeclaringType();
-        List<AbstractTypeDeclaration> types = compilationUnit.types();
-        for (AbstractTypeDeclaration abstractTypeDeclaration : types) {
-            if (abstractTypeDeclaration.getName().getIdentifier().equals(type.getElementName())) {
-                String methodToAnnotateName = method.getElementName();
-                List<BodyDeclaration> bodyDeclarations = getBodyDeclarationsForType(abstractTypeDeclaration);
-                for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
-                    if (bodyDeclaration instanceof MethodDeclaration) {
-                        MethodDeclaration methodDeclaration = (MethodDeclaration) bodyDeclaration;
-                        if (methodDeclaration.getName().getIdentifier().equals(methodToAnnotateName)) {
-                            List<SingleVariableDeclaration> parameters = methodDeclaration.parameters();
-                            for (SingleVariableDeclaration parameter : parameters) {
-                                int parameterStartPosition = parameter.getStartPosition();
-                                int parameterLength = parameter.getLength();
-                                if (offset >= parameterStartPosition
-                                        && offset <= parameterStartPosition + parameterLength) {
-                                    return parameter;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    private static boolean compareMethodParameters(SingleVariableDeclaration paramOne,
-            SingleVariableDeclaration paramTwo) {
-        String typeOne = paramOne.getType().toString();
-        String nameOne = paramOne.getName().getIdentifier();
-
-        String typeTwo = paramTwo.getType().toString();
-        String nameTwo = paramTwo.getName().getIdentifier();
-
-        return (typeOne.equals(typeTwo)) && (nameOne.equals(nameTwo));
-    }
-
-    public static CompletionProposal createCompletionProposal(String proposal, Expression value) {
-        int replacementOffset = value.getStartPosition() + 1;
-        int replacementLength = value.getLength() - 2;
-
-        return new CompletionProposal(proposal, replacementOffset, replacementLength,
-                proposal.length());
-    }
-    
-    public static CompletionProposal createCompletionProposal(String proposal, Expression value,
-            Image image) {
-        int replacementOffset = value.getStartPosition() + 1;
-        int replacementLength = value.getLength() - 2;
-
-        return new CompletionProposal(proposal, replacementOffset, replacementLength, proposal.length(), 
-                image, proposal, null, null);
-    }
-    
-    public static String getStringValue(AnnotationMirror mirror, String attributeName) {
-        AnnotationValue annotationValue = getAnnotationValue(mirror, attributeName);
-        if (annotationValue != null) {
-            return annotationValue.getValue().toString();
-        }
-        return null;
-    }
-    
-    public static Boolean getBooleanValue(AnnotationMirror mirror, String attributeName) {
-        String value = getStringValue(mirror, attributeName);
-        if (value != null) {
-            return Boolean.valueOf(value);
-        }
-        return null;
-    }
-    
-    public static AnnotationValue getAnnotationValue(AnnotationMirror mirror, String attributeName) {
-        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(attributeName)) {
-                return entry.getValue();
-            }
-        }
-        return null;
-    }
-
-    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;
-    }
-    
-    public static String getStringValue(Annotation annotation, String attributeName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, attributeName);
-            if (expression != null && expression instanceof StringLiteral) {
-                return ((StringLiteral) expression).getLiteralValue();
-            }
-        }
-        return null;
-    }
-    
-    public static String getEnumValue(Annotation annotation, String attributeName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, attributeName);
-            if (expression != null && expression instanceof QualifiedName) {
-                return ((QualifiedName) expression).getName().getIdentifier();
-            }
-        }
-        return null;
-    }
-
-    public static Boolean getBooleanValue(Annotation annotation, String attributeName) {
-        if (annotation instanceof NormalAnnotation) {
-            Expression expression = getAnnotationValue((NormalAnnotation) annotation, attributeName);
-            if (expression != null && expression instanceof BooleanLiteral) {
-                return Boolean.valueOf(((BooleanLiteral) expression).booleanValue());
-            }
-        }
-        return null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static Expression getAnnotationValue(NormalAnnotation normalAnnotation, String attributeName) {
-        List<MemberValuePair> memberValuePairs = normalAnnotation.values();
-        for (MemberValuePair memberValuePair : memberValuePairs) {
-            if (memberValuePair.getName().getIdentifier().equals(attributeName)) {
-                return memberValuePair.getValue();
-            }
-        }
-        return null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static Annotation getAnnotation(BodyDeclaration bodyDeclaration,
-            Class<? extends java.lang.annotation.Annotation> annotation) {
-        
-        return getAnnotation(bodyDeclaration.modifiers(), annotation);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Annotation getAnnotation(SingleVariableDeclaration parameter,
-            Class<? extends java.lang.annotation.Annotation> annotation) {
-        
-        return getAnnotation(parameter.modifiers(), annotation);
-    }
-    
-    private static Annotation getAnnotation(List<IExtendedModifier> modifiers, 
-            Class<? extends java.lang.annotation.Annotation> annotation) {
-        if (modifiers != null) {
-            for (IExtendedModifier extendedModifier : modifiers) {
-                if (extendedModifier instanceof Annotation) {
-                    Annotation astAnnotation = (Annotation) extendedModifier;
-                    String typeName = astAnnotation.getTypeName().getFullyQualifiedName();
-                    if (typeName.equals(annotation.getCanonicalName())
-                            || typeName.equals(annotation.getSimpleName())) {
-                        return astAnnotation;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    public static String getStringValue(IAnnotation annotation, String attributeName)
-            throws JavaModelException {
-        Object value = AnnotationUtils.getAnnotationValue(annotation, attributeName);
-        if (value != null) {
-            return value.toString();
-        }
-        return null;
-    }
-    
-    public static String getEnumValue(IAnnotation annotation, String attributeName) throws JavaModelException {
-        String value = AnnotationUtils.getStringValue(annotation, attributeName);
-        if (value != null && value.indexOf(".") != -1) {
-            return value.substring(value.lastIndexOf(".") + 1);
-        }
-        return null;
-    }
-    
-    public static Boolean getBooleanValue(IAnnotation annotation, String attributeName) throws JavaModelException {
-        String value = AnnotationUtils.getStringValue(annotation, attributeName);
-        if (value != null) {
-            return Boolean.valueOf(value);
-        }
-        return null;
-    }
-
-    public static Object getAnnotationValue(IAnnotation annotation, String attributeName)
-            throws JavaModelException {
-        IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-        if (memberValuePairs.length > 0) {
-            for (IMemberValuePair memberValuePair : memberValuePairs) {
-                if (memberValuePair.getMemberName().equals(attributeName)) {
-                    return memberValuePair.getValue();
-                }
-            }
-        }
-        return null;
-    }
-
-    public static IAnnotation getAnnotation(IAnnotatable annotatable,
-            Class<? extends java.lang.annotation.Annotation> annotation) 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;
-    }
-   
-}
diff --git a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.java b/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.java
deleted file mode 100644
index 0364fcf..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessor.java
+++ /dev/null
@@ -1,34 +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.annotations.core.processor;
-
-import java.util.List;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsCoreProcessor implements AnnotationProcessor {
-
-    private List<AnnotationProcessor> annotationProcessors;
-    
-    public AnnotationsCoreProcessor(List<AnnotationProcessor> annotationProcessors) {
-        this.annotationProcessors = annotationProcessors;
-    }
-    
-    public void process() {
-        for (AnnotationProcessor annotationProcessor : annotationProcessors) {
-            annotationProcessor.process();
-        }
-    }
-}
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 1a0093e..0000000
--- a/bundles/org.eclipse.jst.ws.annotations.core/src/org/eclipse/jst/ws/internal/annotations/core/processor/AnnotationsCoreProcessorFactory.java
+++ /dev/null
@@ -1,85 +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.declaration.AnnotationTypeDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsCoreProcessorFactory implements AnnotationProcessorFactory {
-
-    public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> annotationSet,
-            AnnotationProcessorEnvironment processorEnvironment) {
-        
-        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 new AnnotationsCoreProcessor(annotationProcessors);
-    }
-    
-    public AnnotationProcessor getAnnotationProcessor(IConfigurationElement configurationElement,
-            AnnotationProcessorEnvironment processorEnvironment) {
-          try {
-              AbstractAnnotationProcessor annotationProcessor = 
-                  (AbstractAnnotationProcessor)configurationElement.createExecutableExtension("class");
-              annotationProcessor.setAnnotationProcessorEnvironment(processorEnvironment);
-              return annotationProcessor;
-          } catch (CoreException ce) {
-              AnnotationsCorePlugin.log(ce.getStatus());
-          }
-          return null;
-      }
-
-    public Collection<String> supportedAnnotationTypes() {
-        return AnnotationsManager.getAnnotationProcessorsCache().keySet();
-    }
-
-    public Collection<String> supportedOptions() {
-        return Collections.emptyList();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
deleted file mode 100644
index e59b69c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.consumption.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7894f8b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:52 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 276193d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.core;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.core.CXFConsumptionCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.core.commands;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.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.2.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
deleted file mode 100644
index 7c6cf7c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-WEB_SERVICE_LOCATOR_AXIS=Apache CXF Web Service Locator
-WEB_SERVICE_LOCATOR_CATEGORY_AXIS=Apache CXF Components
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
deleted file mode 100644
index 5a3a4b3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension point="org.eclipse.wst.ws.locator">
-      <webServiceLocatorCategory
-         id="ws.locator.category.cxf"
-         label="%WEB_SERVICE_LOCATOR_CATEGORY_CXF"/>
-
-      <webServiceLocator
-         class="org.eclipse.jst.ws.internal.cxf.consumption.core.locator.CXFWebServiceLocator"
-         id="ws.locator.cxf"
-         category="ws.locator.category.cxf"
-         label="WEB_SERVICE_LOCATOR_CXF">
-      </webServiceLocator>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.java
deleted file mode 100644
index 146315b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCoreMessages.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.consumption.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author sclarke
- *
- */
-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 31ab5ab..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/CXFConsumptionCorePlugin.java
+++ /dev/null
@@ -1,80 +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.
- * 
- * @author sclarke
- */
-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 59769f1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.core.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.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.
- * 
- * @author sclarke
- */
-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(model.getJavaSourceFolder());
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-
-        String[] progArgs = CommandLineUtils.getWSDL2JavaGenerateClientArguments(model);
-
-        try {
-            String projectName = model.getProjectName();
-
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            LaunchUtils.launch(javaProject, WSDL2JavaClientCommand.CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyW2JFilesFromTmp(this.model);
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFConsumptionCorePlugin.log(status);
-        }
-
-        ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-        return status;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFConsumptionCorePlugin.log(status);
-                }
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.consumption.core/src/org/eclipse/jst/ws/internal/cxf/consumption/core/commands/WSDL2JavaClientDefaultingCommand.java
deleted file mode 100644
index f3e83cc..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,122 +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.
- * 
- * @author sclarke
- */
-public class WSDL2JavaClientDefaultingCommand extends AbstractDataModelOperation {
-    private WSDL2JavaDataModel model;
-    private String projectName;
-    private String inputURL;
-
-    /**
-     * Constructs a WSDL2JavaClientDefaultingCommand object.
-     * @param model the <code>WSDL2JavaDataModel</code> used to pass information
-     *              between commands.
-     */
-    public WSDL2JavaClientDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
-        this.model = model;
-        this.projectName = projectName;
-        this.inputURL = inputURL;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-    	IStatus status = Status.OK_STATUS;
-        WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-        model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-        model.setProjectName(projectName);
-
-        model.setIncludedNamespaces(new HashMap<String, String>());
-        model.setExcludedNamespaces(new HashMap<String, String>());
-
-        // XJC
-        model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
-        model.setXjcToString(context.isXjcToString());
-        model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
-        model.setXjcToStringSimple(context.isXjcToStringSimple());
-        model.setXjcLocator(context.isXjcLocator());
-        model.setXjcSyncMethods(context.isXjcSyncMethods());
-        model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
-        model.setValidate(context.isValidate());
-        model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
-        model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
-        model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
-        model.setUseDefaultValues(context.isUseDefaultValues());
-        model.setNoAddressBinding(context.isNoAddressBinding());
-        model.setAutoNameResolution(context.isAutoNameResolution());
-        
-        model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()));
-
-    	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);
-
-        		if (wsdlUrl.getProtocol().equals("file")) { //$NON-NLS-1$
-                    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 f45af6f..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,64 +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;
-
-/**
- * @author sclarke
- */
-@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 60cfafc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.consumption.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.consumption.ui.CXFConsumptionUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.consumption.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws.cxf.consumption.core;bundle-version="0.3.4",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
deleted file mode 100644
index 5ade88b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Consumption UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-JAXWS_WEBSERVICETYPE=POJO Web Service
-
-JAXWS_CLIENT=JAX-WS Stub
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
deleted file mode 100644
index 3c0d1b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-  <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-    <webServiceImpl
-            id="org.eclipse.jst.ws.cxf.wsImpl.java"
-            label="%JAXWS_WEBSERVICETYPE"
-            resourceTypeMetadata="File IResource CompilationUnit"
-            extensionMetadata=".java .class"
-            objectSelectionWidget="org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
-            mergerClass="org.eclipse.jst.ws.internal.consumption.common.JavaMerger">
-    </webServiceImpl>
-   </extension>
-   
-   <!--<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
-      <webServiceClientImpl
-            id="org.eclipse.jst.ws.cxf.client.type.java"
-            label="%JAXWS_CLIENT">
-      </webServiceClientImpl>
-   </extension>-->
-   
-   <extension point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class=" org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.CXFJAXWSSelectionLaunchable"
-            external_modify="true"
-            id=" org.eclipse.jst.ws.cxf.consumption.ui.widgets.object.CXFJAXWSSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object.JAXWSSelectionTransformer">
-      </objectSelectionWidget>
-   </extension>
-   
-   <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.WSDL2JavaClientConfigWidgetFactory"
-             id="WSDL2JavaClientConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.consumption.core.commands.WSDL2JavaClientCommand">
-       </widgetFactory>
-   </extension>
-   
-  </plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
deleted file mode 100644
index 68eacad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIMessages.java
+++ /dev/null
@@ -1,42 +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;
-
-/**
- * 
- * @author sclarke
- *
- */
-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 b9f6c76..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 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 9009837..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/CXFConsumptionUIPlugin.java
+++ /dev/null
@@ -1,80 +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
- * 
- * @author sclarke
- */
-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 3a891ed..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,206 +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;
-
-/**
- * @author sclarke
- */
-@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();
-            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 5670049..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidget.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameEditingSupport;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameTableContentProvider;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.WSDL2JavaWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@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(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
-        this.statusListener = statusListener;
-
-        final Composite mainComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(3, false);
-        mainComposite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        mainComposite.setLayoutData(gridData);
-
-        // Output Dir
-        WSDL2JavaWidgetFactory.createOutputDirectoryLabel(mainComposite);
-
-        Combo outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        outputDirCombo.setLayoutData(gridData);
-
-        // Package Name:
-        WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
-        final Text packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        packageNameText.setLayoutData(gridData);
-
-        packageNameText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                String packageName = packageNameText.getText();
-                status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
-                statusListener.handleEvent(null);
-            }
-        });
-
-        final Button namespaceMappingButton = WSDL2JavaWidgetFactory
-                .createNamespacePackageMappingButton(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 3;
-        namespaceMappingButton.setLayoutData(gridData);
-        namespaceMappingButton.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                if (namespaceMappingButton.getSelection()) {
-                    if (namespaceComposite == null) {
-                        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-                        gridData.horizontalSpan = 3;
-                        gridData.verticalSpan = 7;
-                        namespaceCompositeHolder.setLayoutData(gridData);
-                        namespaceCompositeHolder.pack();
-
-                        namespaceComposite = getNamespaceMappingComposite(namespaceCompositeHolder);
-                        if (namespaceCompositeHeight == -1) {
-                            Point groupSize = namespaceComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
-                            namespaceCompositeHeight = groupSize.y;
-                        }
-                        Shell shell = parent.getShell();
-                        Point shellSize = shell.getSize();
-                        shell.setSize(shellSize.x, shellSize.y + namespaceCompositeHeight);
-
-                        namespaceCompositeHolder.layout();
-                    }
-                } else {
-                    if (namespaceComposite != null) {
-                        GridData gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-                        gridData.horizontalSpan = 3;
-                        namespaceCompositeHolder.setLayoutData(gridData);
-                        namespaceCompositeHolder.pack();
-                        namespaceComposite.dispose();
-                        namespaceComposite = null;
-                        namespaceCompositeHolder.layout();
-                        Shell shell = parent.getShell();
-                        Point shellSize = shell.getSize();
-                        shell.setSize(shellSize.x, shellSize.y - namespaceCompositeHeight);
-                    }
-                }
-            }
-        });
-
-        namespaceCompositeHolder = new Composite(mainComposite, SWT.NONE);
-        gridLayout = new GridLayout(1, true);
-        namespaceCompositeHolder.setLayout(gridLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.horizontalSpan = 3;
-        namespaceCompositeHolder.setLayoutData(gridData);
-
-        // Service Name:
-//        WSDL2JavaWidgetFactory.createServiceNameLabel(mainComposite);
-//
-//        Combo serviceNameCombo = WSDL2JavaWidgetFactory.createServiceNameCombo(mainComposite, model);
-//        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-//        gridData.horizontalSpan = 2;
-//        serviceNameCombo.setLayoutData(gridData);
-
-        Label bindingFilesLabel = WSDL2JavaWidgetFactory.createBindingFilesLabel(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.verticalSpan = 3;
-        bindingFilesLabel.setLayoutData(gridData);
-
-        List bindingFilesList = WSDL2JavaWidgetFactory.createBindingFilesList(mainComposite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.verticalSpan = 3;
-        bindingFilesList.setLayoutData(gridData);
-
-        Button addBindingFileButton = WSDL2JavaWidgetFactory.createAddBindingFileButton(mainComposite, model,
-                bindingFilesList);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        addBindingFileButton.setLayoutData(gridData);
-
-        Button removeBindingFileButton = WSDL2JavaWidgetFactory.createRemoveBindingFileButton(mainComposite,
-                model, bindingFilesList);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        removeBindingFileButton.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createPaddingLabel(mainComposite);
-
-        /*
-        WSDL2JavaWidgetFactory.createXMLCatalogLabel(mainComposite);
-
-        Text xmlCatalogText = WSDL2JavaWidgetFactory.createXMLCatalogText(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xmlCatalogText.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createXMLCatalogBrowseButton(mainComposite);
-         */
-        return this;
-    }
-
-    public Table createNamespaceMappingTable(Composite parent) {
-        TableViewer packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
-                | SWT.FULL_SELECTION);
-
-        final Table packageNameTable = packageNameTableViewer.getTable();
-        packageNameTable.setLinesVisible(true);
-        packageNameTable.setHeaderVisible(true);
-
-        TableLayout tableLayout = new TableLayout();
-        packageNameTable.setLayout(tableLayout);
-
-        WSDL2JavaWidgetFactory.createWSDLNamespaceViewerColumn(packageNameTableViewer);
-
-        ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        TableViewerColumn packageNameViewerColumn = WSDL2JavaWidgetFactory.createPackageNameColumn(
-                packageNameTableViewer, model);
-
-        TextCellEditor textCellEditor = new TextCellEditor(packageNameTableViewer.getTable());
-        textCellEditor.addListener( new ICellEditorListener() {
-		
-			public void editorValueChanged(boolean oldValidState, boolean newValidState) {
-				statusListener.handleEvent(null);				
-			}
-		
-			public void cancelEditor() {
-			}
-		
-			public void applyEditorValue() {
-			}
-		});
-        
-        textCellEditor.setValidator(new ICellEditorValidator() {
-		
-			public String isValid(Object packageName) {
-	            status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
-	            if (status.getSeverity() == IStatus.OK) {
-	                return null;
-	            }
-	            return status.getMessage();
-			}
-		});
-
-        packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
-        		textCellEditor, model));
-
-        columnWeightData = new ColumnWeightData(100, 100, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        packageNameTableViewer.setContentProvider(new PackageNameTableContentProvider());
-        packageNameTableViewer.setInput(model.getWsdlDefinition());
-
-        TableItem[] tableItems = packageNameTableViewer.getTable().getItems();
-        for (int i = 0; i < tableItems.length; i++) {
-            TableItem tableItem = tableItems[i];
-            if (model.getIncludedNamespaces().containsKey(tableItem.getText(0))) {
-                tableItem.setChecked(true);
-            }
-        }
-        return packageNameTable;
-    }
-
-    private Composite getNamespaceMappingComposite(Composite parent) {
-        namespaceComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(1, true);
-        namespaceComposite.setLayout(gridLayout);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        namespaceComposite.setLayoutData(gridData);
-
-        Table packageNameTable = createNamespaceMappingTable(namespaceComposite);
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        packageNameTable.setLayoutData(gridData);
-
-        return namespaceComposite;
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return status;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientConfigWidgetFactory.java
deleted file mode 100644
index 4b0ceba..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,95 +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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-    private SimpleWidgetContributor wsdl2JavaClientWidgetContributor;
-    private SimpleWidgetContributor wsdl2JavaClientDefaultsWidgetContributor;
-
-    private WSDL2JavaDataModel model;
-
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if ((model != null) && (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) {
-        this.model = model;
-        if ((model != null) && (wsdl2JavaClientWidgetContributor == null
-                || wsdl2JavaClientDefaultsWidgetContributor == null)) {
-            init();
-        }
-    }
-
-    private void init() {
-        final WSDL2JavaClientConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaClientConfigWidget(model);
-        wsdl2JavaClientWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        String wsdl2JavaClientPageTitle = CXFConsumptionUIMessages.bind(
-                CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_TITLE, new Object[]{
-                        context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        wsdl2JavaClientWidgetContributor.setTitle(wsdl2JavaClientPageTitle);
-        wsdl2JavaClientWidgetContributor
-                .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_PAGE_DESCRIPTION);
-        wsdl2JavaClientWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaConfigWidget;
-            }
-        });
-        
-        final WSDL2JavaClientDefaultsConfigWidget wsdl2JavaClientDefaultsConfigWidget = 
-            new WSDL2JavaClientDefaultsConfigWidget(model);
-        wsdl2JavaClientDefaultsWidgetContributor = new SimpleWidgetContributor();
-        String wsdl2JavaClientDefaultsPageTitle = CXFConsumptionUIMessages.bind(
-        CXFConsumptionUIMessages.WSDL2JAVA_ClIENT_DEFAULTS_PAGE_TITLE, new Object[] {
-                context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        wsdl2JavaClientDefaultsWidgetContributor.setTitle(wsdl2JavaClientDefaultsPageTitle);
-        wsdl2JavaClientDefaultsWidgetContributor
-                .setDescription(CXFConsumptionUIMessages.WSDL2JAVA_CLIENT_DEFAULTS_PAGE_DESCRIPTION);
-        wsdl2JavaClientDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaClientDefaultsConfigWidget;
-            }
-        });
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/WSDL2JavaClientDefaultsConfigWidget.java
deleted file mode 100644
index d0c7628..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,100 +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;
-
-/**
- * 
- * @author sclarke
- *
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaClientDefaultsConfigWidget extends SimpleWidgetDataContributor {
-    
-    private WSDL2JavaDataModel model;
-    
-    public WSDL2JavaClientDefaultsConfigWidget(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-    
-    @Override
-    public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
-        final Composite mainComposite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(1, false);
-        mainComposite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        mainComposite.setLayoutData(gridData);
-
-        Group wsdl2javaGroup = new Group(mainComposite, SWT.SHADOW_IN);
-        wsdl2javaGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_GROUP_LABEL);
-        GridLayout wsdl2javalayout = new GridLayout(1, true);
-        wsdl2javaGroup.setLayout(wsdl2javalayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdl2javaGroup.setLayoutData(gridData);
-
-//        WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
-        WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
-        if (CXFModelUtils.isAutoNameResolutionPermitted()) {
-            WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
-        }
-        
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
-        }
-        
-        Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
-        xjcArgGroup.setText(CXFConsumptionUIMessages.WSDL2JAVA_XJC_ARG_GROUP_LABEL);
-        GridLayout xjcArgLayout = new GridLayout(1, true);
-        xjcArgGroup.setLayout(xjcArgLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xjcArgGroup.setLayoutData(gridData);
-
-        Table xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        xjcArgsTable.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, model);
-        WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable, model);
-        return this;
-    }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java b/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
deleted file mode 100644
index aedda27..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,78 +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.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.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * @author sclarke
- */
-@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 = JDTUtils.getJavaProject(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 876eca5..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,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.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;
-
-/**
- * @author sclarke
- */
-@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 2d39e4e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,60 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.core;singleton:=true
-Bundle-Version: 0.4.3.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.core;
-  x-friends:="org.eclipse.jst.ws.cxf.ui,
-   org.eclipse.jst.ws.cxf.consumption.ui,
-   org.eclipse.jst.ws.cxf.creation.core,
-   org.eclipse.jst.ws.cxf.creation.ui,
-   org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.context;x-friends:="org.eclipse.jst.ws.cxf.ui,org.eclipse.jst.ws.cxf.creation.core,org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model;
-  x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,
-   org.eclipse.jst.ws.cxf.creation.core,
-   org.eclipse.jst.ws.cxf.ui,
-   org.eclipse.jst.ws.cxf.creation.ui,
-   org.eclipse.jst.ws.cxf.consumption.core",
- org.eclipse.jst.ws.internal.cxf.core.model.impl;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.core.resources;x-friends:="org.eclipse.jst.ws.cxf.creation.core",
- org.eclipse.jst.ws.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.2.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.emf.codegen;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- org.jdom;version="1.0.0",
- org.jdom.input;version="1.0.0",
- org.jdom.output;version="1.0.0"
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.html b/bundles/org.eclipse.jst.ws.cxf.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.ini b/bundles/org.eclipse.jst.ws.cxf.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for feature details in the "About" 
-# dialog (translated).  Maximum 15 lines and 75 characters per line.
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings b/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/about.properties b/bundles/org.eclipse.jst.ws.cxf.core/about.properties
deleted file mode 100644
index f89916e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=CXF Web Services (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.core/build.properties
deleted file mode 100644
index a47ba23..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               jmerger/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               icons/
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
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 6039cc5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
-    nsURI="http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore" nsPrefix="org.eclipse.jst.ws.internal.cxf.core.model">
-  <eClassifiers xsi:type="ecore:EClass" name="CXFContext" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeEdition" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cxfRuntimeVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verbose" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateAntBuildFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateClient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateServer" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="databinding" eType="#//DataBinding"
-        defaultValueLiteral="jaxb"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="frontend" eType="#//Frontend"
-        defaultValueLiteral="jaxws"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useSpringApplicationContext"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="exportCXFClasspathContainer"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CXFDataModel" abstract="true" eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="projectName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlFileName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlURL" eType="#//URL"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configWsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaClassName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedJavaInterfaceName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="configId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetNamespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="endpointName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlDefinition" eType="#//Definition"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlLocation" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Java2WSContext" abstract="true" interface="true"
-      eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="soap12Binding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateXSDImports" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWSDL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWrapperFaultBeans"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationProcessingEnabled"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebMethodAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateWebParamAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateRequestWrapperAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateResponseWrapperAnnotation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Java2WSDataModel" eSuperTypes="#//CXFDataModel #//Java2WSContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classpath" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaStartingPoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useServiceEndpointInterface"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="extractInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="serviceEndpointInterfaceName"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodMap">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="#//IMethod"/>
-        <eTypeArguments eClassifier="#//Map">
-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-        </eTypeArguments>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationMap">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceDirectory" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="portName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaContext" abstract="true" interface="true"
-      eSuperTypes="#//CXFContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="generateImplementation"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="processSOAPHeaders" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultNamespacePackageNameMapping"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="loadDefaultExcludesNamepsaceMapping"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="wsdlVersion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="1.1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcArgs" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="noAddressBinding" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcUseDefaultValues" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringMultiLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcToStringSimple" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcLocator" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcSyncMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcMarkGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xjcEpisodeFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="autoNameResolution" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="WSDL2JavaDataModel" eSuperTypes="#//CXFDataModel #//WSDL2JavaContext">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="includedNamespaces">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bindingFiles" upperBound="-1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludedNamespaces">
-      <eGenericType eClassifier="#//Map">
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eGenericType>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalogFile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaSourceFolder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Frontend">
-    <eLiterals name="JAXWS" literal="jaxws"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="DataBinding">
-    <eLiterals name="JAXB" literal="jaxb"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="URL" instanceClassName="java.net.URL"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Definition" instanceClassName="javax.wsdl.Definition"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="Map" instanceClassName="java.util.Map">
-    <eTypeParameters name="T"/>
-    <eTypeParameters name="T1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IMethod" instanceClassName="org.eclipse.jdt.core.IMethod"/>
-</ecore:EPackage>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
deleted file mode 100644
index bc323f6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.ecore_diagram
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_yrUN0eukEd2pfImT1jT7vQ" type="Ecore" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_zJtaAOukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LAOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LAeukEd2pfImT1jT7vQ" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_zS81kOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeLocation"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81keukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81kuukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeEdition"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81k-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81lOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/cxfRuntimeVersion"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81leukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81luukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/verbose"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81l-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81mOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateAntBuildFile"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81meukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81muukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateClient"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81m-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81nOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/generateServer"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81neukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81nuukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/databinding"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81n-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81oOukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/frontend"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81oeukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_zS81ouukEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/useSpringApplicationContext"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_zS81o-ukEd2pfImT1jT7vQ"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_-IhwoOunEd2pfImT1jT7vQ" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//CXFContext/exportCXFClasspathContainer"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_-IhwoeunEd2pfImT1jT7vQ"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LA-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LBOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LBeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LBuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LB-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LCOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LCeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LCuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LC-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LDOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJtaAeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJtaAuukEd2pfImT1jT7vQ" x="465" y="15"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LDeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LEOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LEeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LEuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LE-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LFOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LFeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LFuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LF-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LGOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LGeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LGuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LG-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LHOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LDuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//CXFDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LD-ukEd2pfImT1jT7vQ" x="465" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LHeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LIOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LIeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LIuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LI-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LJOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LJeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LJuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LJ-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LKOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LKeukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LKuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LK-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LLOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LHuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LH-ukEd2pfImT1jT7vQ" x="185" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zJ3LLeukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zJ3LMOukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LMeukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LMuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LM-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LNOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zJ3LNeukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zJ3LNuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zJ3LN-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zJ3LOOukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAU8OukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU8eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU8uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU8-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zJ3LLuukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//Java2WSDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zJ3LL-ukEd2pfImT1jT7vQ" x="230" y="620"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAU9OukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zKAU9-ukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAU-OukEd2pfImT1jT7vQ" type="7001">
-      <children xmi:type="notation:Node" xmi:id="_cwezIB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/generateImplementation"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwezIR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwezIh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/processSOAPHeaders"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaMR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultNamespacePackageNameMapping"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaMh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaMx92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/loadDefaultExcludesNamepsaceMapping"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwfaNB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwfaNR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/validate"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBQR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/wsdlVersion"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBQh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBQx92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/useDefaultValues"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRB92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgBRR92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcArgs"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgBRh92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgoUB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/noAddressBinding"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwgoUh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcUseDefaultValues"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwgoUx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPYB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToString"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPYh92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringMultiLine"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPYx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwhPZB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcToStringSimple"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwhPZR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2cB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcLocator"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2ch92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcSyncMethods"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2cx92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwh2dB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcMarkGenerated"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwh2dR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_cwidgB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/xjcEpisodeFile"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_cwidgR92Ed6I5swlrsn37g"/>
-      </children>
-      <children xmi:type="notation:Node" xmi:id="_jVh0gB92Ed6I5swlrsn37g" type="3001">
-        <element xmi:type="ecore:EAttribute" href="CXF.ecore#//WSDL2JavaContext/autoNameResolution"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_jVh0gR92Ed6I5swlrsn37g"/>
-      </children>
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU-eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU-uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU--ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAU_OukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAU_eukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAU_uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAU_-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVAOukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVAeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVA-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAU9eukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaContext"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAU9uukEd2pfImT1jT7vQ" x="725" y="290"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVBOukEd2pfImT1jT7vQ" type="2001">
-    <children xmi:type="notation:Node" xmi:id="_zKAVB-ukEd2pfImT1jT7vQ" type="5001"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVCOukEd2pfImT1jT7vQ" type="7001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVCeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVCuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVC-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVDOukEd2pfImT1jT7vQ" type="7002">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVDeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVDuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVD-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVEOukEd2pfImT1jT7vQ" type="7003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVEeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVEuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVE-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVBeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EClass" href="CXF.ecore#//WSDL2JavaDataModel"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVBuukEd2pfImT1jT7vQ" x="750" y="670"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVFOukEd2pfImT1jT7vQ" type="2005">
-    <children xmi:type="notation:Node" xmi:id="_zKAVF-ukEd2pfImT1jT7vQ" type="5005"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVGOukEd2pfImT1jT7vQ" type="7011">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVGeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVGuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVG-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVHOukEd2pfImT1jT7vQ" type="7012">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVHeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVHuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVH-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVFeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EEnum" href="CXF.ecore#//Frontend"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVFuukEd2pfImT1jT7vQ" x="735" y="15" width="91"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVIOukEd2pfImT1jT7vQ" type="2005">
-    <children xmi:type="notation:Node" xmi:id="_zKAVI-ukEd2pfImT1jT7vQ" type="5005"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVJOukEd2pfImT1jT7vQ" type="7011">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVJeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVJuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVJ-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zKAVKOukEd2pfImT1jT7vQ" type="7012">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVKeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVKuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVK-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVIeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EEnum" href="CXF.ecore#//DataBinding"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVIuukEd2pfImT1jT7vQ" x="735" y="75" width="91"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVLOukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKAVL-ukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKAVMOukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKAVMeukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKAVMuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKAVM-ukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVLeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//URL"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVLuukEd2pfImT1jT7vQ" x="185" y="15" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKAVNOukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKF8OukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKF8eukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF8uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF8-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF9OukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKAVNeukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//Definition"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKAVNuukEd2pfImT1jT7vQ" x="185" y="60" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKKF9eukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKF-OukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKF-eukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKF-uukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKF--ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKF_OukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF9uukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//Map"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF9-ukEd2pfImT1jT7vQ" x="185" y="110" width="76"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zKKF_eukEd2pfImT1jT7vQ" type="2004">
-    <children xmi:type="notation:Node" xmi:id="_zKKGAOukEd2pfImT1jT7vQ" type="5004"/>
-    <children xmi:type="notation:Node" xmi:id="_zKKGAeukEd2pfImT1jT7vQ" type="7010">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zKKGAuukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zKKGA-ukEd2pfImT1jT7vQ"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zKKGBOukEd2pfImT1jT7vQ"/>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_zKKF_uukEd2pfImT1jT7vQ"/>
-    <element xmi:type="ecore:EDataType" href="CXF.ecore#//IMethod"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zKKF_-ukEd2pfImT1jT7vQ" x="185" y="155" width="76"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_yrUN0uukEd2pfImT1jT7vQ"/>
-  <element xmi:type="ecore:EPackage" href="CXF.ecore#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_zUl0UOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LDeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zUl0UeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zUl0UuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zUl0U-ukEd2pfImT1jT7vQ" points="[4, -1, 1, 73]$[4, -73, 1, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9COukEd2pfImT1jT7vQ" id="(0.46,0.007490637)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CeukEd2pfImT1jT7vQ" id="(0.5027027,0.9852217)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgQOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LHeukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgQeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgQuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgQ-ukEd2pfImT1jT7vQ" points="[0, 1, -41, 318]$[41, -317, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AOukEd2pfImT1jT7vQ" id="(0.8995816,0.04278075)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AeukEd2pfImT1jT7vQ" id="(0.10810811,0.9950739)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgROukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgReukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgRuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgR-ukEd2pfImT1jT7vQ" points="[0, 0, -60, -120]$[60, 120, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9CuukEd2pfImT1jT7vQ" id="(0.90816325,0.0053475937)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9C-ukEd2pfImT1jT7vQ" id="(0.255,0.98876405)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgSOukEd2pfImT1jT7vQ" type="4004" source="_zJ3LLeukEd2pfImT1jT7vQ" target="_zJ3LHeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgSeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgSuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgS-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 62]$[60, -61, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DOukEd2pfImT1jT7vQ" id="(0.3877551,0.0053475937)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9DeukEd2pfImT1jT7vQ" id="(0.51046026,0.98930484)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgTOukEd2pfImT1jT7vQ" type="4004" source="_zKAU9OukEd2pfImT1jT7vQ" target="_zJtaAOukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgTeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgTuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgT-ukEd2pfImT1jT7vQ" points="[0, 0, -60, 301]$[60, -300, 0, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BuukEd2pfImT1jT7vQ" id="(1.0,0.4984127)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9B-ukEd2pfImT1jT7vQ" id="(0.84864867,0.9655172)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgUOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zJ3LDeukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgUeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgUuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgU-ukEd2pfImT1jT7vQ" points="[-56, -30, 374, 202]$[-265, -143, 165, 89]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9AuukEd2pfImT1jT7vQ" id="(0.055172414,0.008130081)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9A-ukEd2pfImT1jT7vQ" id="(0.0,0.6666667)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_zVCgVOukEd2pfImT1jT7vQ" type="4004" source="_zKAVBOukEd2pfImT1jT7vQ" target="_zKAU9OukEd2pfImT1jT7vQ">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_zVCgVeukEd2pfImT1jT7vQ"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zVCgVuukEd2pfImT1jT7vQ"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVCgV-ukEd2pfImT1jT7vQ" points="[0, 0, -111, 0]$[111, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BOukEd2pfImT1jT7vQ" id="(0.5862069,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWX9BeukEd2pfImT1jT7vQ" id="(0.4029304,0.9936508)"/>
-  </edges>
-</notation:Diagram>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel b/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
deleted file mode 100644
index 2e48da2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/model/CXF.genmodel
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2008 IONA Technologies PLC&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA;Contributors:&#xD;&#xA;IONA Technologies PLC - initial API and implementation"
-    modelDirectory="/org.eclipse.jst.ws.cxf.core/src" modelPluginID="org.eclipse.jst.ws.cxf.core"
-    modelName="CXF" rootExtendsInterface="" rootImplementsInterface="" importerID="org.eclipse.emf.importer.java"
-    complianceLevel="5.0" copyrightFields="false" language="">
-  <foreignModel>@model</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"/>
-    </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"/>
-    </genClasses>
-    <genClasses ecoreClass="CXF.ecore#//WSDL2JavaDataModel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/includedNamespaces"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/bindingFiles"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/excludedNamespaces"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/catalogFile"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute CXF.ecore#//WSDL2JavaDataModel/javaSourceFolder"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
deleted file mode 100644
index 4e243e6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-CXF_FACET_CORE_LABEL=CXF 2.x Web Services
-CXF_FACET_CORE_DISCRIPTION=Enables Web Services generation through CXF 2.x
-CXF_CORE_TEMPLATE_LABEL=CXF Web Services Project
-CXF_FACET_JST_WEB24_PRESET_LABEL=CXF Web Services Project v2.4
-CXF_FACET_JST_WEB25_PRESET_LABEL=CXF Web Services Project v2.5
-CXF_FACET_JST_WEB24_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.4 and Java v5.0
-CXF_FACET_JST_WEB25_PRESET_DESCRIPTION=Configures a Dynamic Web Project with CXF using Web Module v2.5 and Java v5.0
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
deleted file mode 100644
index e783d88..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-    <extension point="org.eclipse.emf.ecore.generated_package">
-       <package 
-          uri = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore" 
-          class = "org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage"
-          genModel = "model/CXF.genmodel" /> 
-    </extension>
-    
-	<extension point="org.eclipse.wst.common.project.facet.core.facets">
-       <project-facet id="cxf.core">
-          <label>%CXF_FACET_CORE_LABEL</label>
-	      <description>%CXF_FACET_CORE_DISCRIPTION</description>
-	   </project-facet>
-       
-	   <project-facet-version facet="cxf.core" version="1.0">
-	      <constraint>
-		     <and>
-      	        <requires facet="jst.web" version="[2.4"/>
-      	        <requires facet="jst.java" version="[5.0"/>
-                <conflicts facet="axis2.core" version="[1.0"/>
-                <conflicts facet="axis2.ext" version="[1.0"/>
-             </and>
-          </constraint>
-          
-          <action id="cxf.core.install" type="INSTALL">
-      	     <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetInstallDelegate"/>
-    	  </action>
-          
-          <action id="cxf.core.uninstall" type="UNINSTALL">
-             <delegate class="org.eclipse.jst.ws.internal.cxf.facet.CXFFacetUninstallDelegate"/>
-          </action>
-  	   </project-facet-version>
-       <template id="template.cxf.core">
-          <label>%CXF_CORE_TEMPLATE_LABEL</label>
-          <fixed
-               facet="cxf.core">
-          </fixed>
-          <fixed
-               facet="jst.web">
-          </fixed>
-          <fixed
-               facet="jst.java">
-          </fixed>
-          <preset
-             id="cxf.jst.web24.preset">
-          </preset>
-       </template>
-	</extension>
-	
-	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
-       <supported>
-          <runtime-component any="true"/>
-          <facet
-             id="cxf.core"
-             version="1.0"/>
-       </supported>
-    </extension>
-
-    <extension point="org.eclipse.wst.common.project.facet.core.presets">
-       <static-preset id="cxf.jst.web24.preset">
-          <label>%CXF_FACET_JST_WEB24_PRESET_LABEL</label>
-          <description>%CXF_FACET_JST_WEB24_PRESET_DESCRIPTION</description>
-          <facet
-             id="cxf.core"
-             version="1.0">
-          </facet>
-          <facet
-             id="jst.web"
-             version="2.4">
-          </facet>
-          <facet
-             id="jst.java"
-             version="5.0">
-          </facet>
-       </static-preset>
-       <static-preset id="cxf.jst.web25.preset">
-          <label>%CXF_FACET_JST_WEB25_PRESET_LABEL</label>
-          <description>%CXF_FACET_JST_WEB25_PRESET_DESCRIPTION</description>
-          <facet
-             id="cxf.core"
-             version="1.0">
-          </facet>
-          <facet
-             id="jst.web"
-             version="2.5">
-          </facet>
-          <facet
-             id="jst.java"
-             version="5.0">
-          </facet>
-       </static-preset>
-    </extension>
-    
-    <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-       <classpathContainerInitializer
-             class="org.eclipse.jst.ws.internal.cxf.core.CXFClasspathContainerInitializer"
-             id="org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER">
-       </classpathContainerInitializer>
-    </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
deleted file mode 100644
index 00f174b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class CXFClasspathContainer implements IClasspathContainer {
-
-	private IPath path;
-	private List<IClasspathEntry> classpathEntries;
-	private String cxfLibraryEdition;
-	private String cxfLibraryVersion;
-	private String cxfLibraryLocation;
-	
-	public CXFClasspathContainer(IPath path, IJavaProject javaProject) {
-		this.path = path;
-		classpathEntries =  new ArrayList<IClasspathEntry>();
-		cxfLibraryLocation = getCxfRuntimeLocation();
-		cxfLibraryVersion = getCxfRuntimeVersion();
-		cxfLibraryEdition = getCxfRuntimeEdition();
-	}
-	
-	public IClasspathEntry[] getClasspathEntries() {
-        if (!cxfLibraryVersion.equals(getCxfRuntimeVersion())) {
-            classpathEntries = new ArrayList<IClasspathEntry>();
-            cxfLibraryLocation = getCxfRuntimeLocation();
-            cxfLibraryVersion = getCxfRuntimeVersion();
-            cxfLibraryEdition = getCxfRuntimeEdition();
-        }
-
-	    if (classpathEntries.size() == 0) {
-	        File cxfLibDirectory = getCXFLibraryDirectory();
-	        if (cxfLibDirectory.exists() && cxfLibDirectory.isDirectory()) {
-	            String[] files = cxfLibDirectory.list();
-	            for (int i = 0; i < files.length; i++) {
-	                File file = new File(cxfLibDirectory.getPath() + File.separator + files[i]);
-	                String fileName = file.getName();
-	                if (fileName.indexOf(".") != -1
-	                        && fileName.substring(fileName.lastIndexOf("."), fileName.length()).equals(
-	                                ".jar")) {
-	                	classpathEntries.add(JavaCore.newLibraryEntry(new Path(file.getAbsolutePath()), null, 
-	                	        new Path("/")));
-	                }
-	            }
-	        }
-		}
-		return classpathEntries.toArray(new IClasspathEntry[classpathEntries.size()]);
-	}
-	
-	public boolean isValid() {
-	    if (getCxfRuntimeLocation().length() > 0) {
-            File cxfLibDirectory = getCXFLibraryDirectory();
-            return cxfLibDirectory.exists() && cxfLibDirectory.isDirectory();
-	    }
-	    return false;
-	}
-	
-	public String getDescription() {
-		return  MessageFormat.format(CXFCoreMessages.CXF_CONTAINER_LIBRARY, cxfLibraryEdition, 
-		        cxfLibraryVersion);
-	}
-
-	public int getKind() {
-		return K_APPLICATION;
-	}
-
-	public IPath getPath() {
-		return path;
-	}
-	
-	private String getCxfRuntimeLocation() {
-	    return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation();
-    }
-
-    private String getCxfRuntimeVersion() {
-        return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
-    }
-
-    private String getCxfRuntimeEdition() {
-        return CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeEdition();
-    }
-
-	private File getCXFLibraryDirectory() {
-        IPath cxfLibPath = new Path(cxfLibraryLocation);
-        if (!cxfLibPath.hasTrailingSeparator()) {
-            cxfLibPath = cxfLibPath.addTrailingSeparator();
-        }
-        cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
-        File cxfLibDirectory = new File(cxfLibPath.toOSString());
-        return cxfLibDirectory;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
deleted file mode 100644
index 7a3ef42..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFClasspathContainerInitializer.java
+++ /dev/null
@@ -1,36 +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;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class CXFClasspathContainerInitializer extends ClasspathContainerInitializer {
-
-	@Override
-	public void initialize(IPath containerPath, IJavaProject javaProject) throws CoreException {
-	    CXFClasspathContainer cxfClasspathContainer = new CXFClasspathContainer(containerPath, javaProject);
-	    
-	    if (cxfClasspathContainer.isValid()) {
-	        JavaCore.setClasspathContainer(containerPath, new IJavaProject[] {javaProject}, 
-				new IClasspathContainer[] {cxfClasspathContainer}, null);
-	    }
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
deleted file mode 100644
index 3150b19..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
+++ /dev/null
@@ -1,36 +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;
-
-/**
- * 
- * @author sclarke
- *
- */
-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 2ba6e75..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- * @author sclarke
- */
-public class CXFCorePlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.core"; //$NON-NLS-1$
-
-    public static final String CXF_VERSION_2_0 = "2.0"; //$NON-NLS-1$
-
-    public static final String CXF_VERSION_2_1 = "2.1"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFCorePlugin plugin;
-
-    private Java2WSPersistentContext java2WSContext;
-    private WSDL2JavaPersistentContext wsdl2JavaContext;
-
-    private Version currentRuntimeVersion;
-    
-    /**
-     * The constructor
-     */
-    public CXFCorePlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFCorePlugin getDefault() {
-        return plugin;
-    }
-
-    public Java2WSPersistentContext getJava2WSContext() {
-        if (java2WSContext == null) {
-            java2WSContext = new Java2WSPersistentContext();
-            java2WSContext.load();
-        }
-        return java2WSContext;
-    }
-
-    public WSDL2JavaPersistentContext getWSDL2JavaContext() {
-        if (wsdl2JavaContext == null) {
-            wsdl2JavaContext = new WSDL2JavaPersistentContext();
-            wsdl2JavaContext.load();
-        }
-        return wsdl2JavaContext;
-    }
-
-    public Version getCurrentRuntimeVersion() {
-        if (currentRuntimeVersion == null) {
-            String cxfRuntimeVersion = CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeVersion();
-            if (cxfRuntimeVersion.length() == 0) {
-                cxfRuntimeVersion = "0.0.0";
-            }
-            this.currentRuntimeVersion = new Version(cxfRuntimeVersion);
-        }
-        return currentRuntimeVersion;
-    }
-
-    public void setCurrentRuntimeVersion(Version version) {
-        this.currentRuntimeVersion = version;
-    }
-    
-    public static void logMessage(int severity, String message) {
-        CXFCorePlugin.log(new Status(severity, CXFCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFCorePlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFCorePlugin.log(new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 
-                exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
deleted file mode 100644
index bc71868..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public abstract class CXFPersistentContext extends PersistentContext implements CXFContext {
-    /**
-     * String constant used to lookup the cxf runtime location general
-     * preference from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_LOCATION = "cxfRuntimeLocation"; //$NON-NLS-1$
-
-    /**
-     * Stirng constant used to lookup the cxf runtime edition general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_EDITION = "cxfRuntimeEdition"; //$NON-NLS-1$
-
-    /**
-     * Stirng constant used to lookup the cxf version general preference from
-     * the plugins local preferences store.
-     */
-    private static final String PREFERENCE_CXF_RUNTIME_VERSION = "cxfRuntimeVersion"; //$NON-NLS-1$
-    
-    private static final String PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER = "exportCXFClasspathContainer"; //$NON-NLS-1$
-
-    private static final String PREFERENCE_CXF_VERBOSE = "cxfVerbose"; //$NON-NLS-1$
-
-    private static final String PREFERENCE_CXF_USE_SPRING_APP_CONTEXT = "cxfUseSpringAppContext"; //$NON-NLS-1$
-
-    public CXFPersistentContext(Plugin plugin) {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        setDefault(PREFERENCE_CXF_RUNTIME_LOCATION, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_EDITION, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_CXF_RUNTIME_VERSION, ""); //$NON-NLS-1$
-        
-        setDefault(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-
-        setDefault(PREFERENCE_CXF_VERBOSE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__VERBOSE));
-
-        setDefault(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT));
-    }
-
-    public String getCxfRuntimeLocation() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_LOCATION);
-    }
-
-    public void setCxfRuntimeLocation(String runtimeLocation) {
-        setValue(PREFERENCE_CXF_RUNTIME_LOCATION, runtimeLocation);
-    }
-    
-    public String getCxfRuntimeEdition() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_EDITION);
-    }
-
-    public void setCxfRuntimeEdition(String runtimeEdition) {
-        setValue(PREFERENCE_CXF_RUNTIME_EDITION, runtimeEdition);
-    }
-
-    public String getCxfRuntimeVersion() {
-        return getValueAsString(PREFERENCE_CXF_RUNTIME_VERSION);
-    }
-
-    public void setCxfRuntimeVersion(String runtimeVersion) {
-        setValue(PREFERENCE_CXF_RUNTIME_VERSION, runtimeVersion);
-    }
-    
-    public boolean isExportCXFClasspathContainer() {
-        return getValueAsBoolean(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER);
-    }
-
-    public void setExportCXFClasspathContainer(boolean exportCXFClasspathContainer) {
-        setValue(PREFERENCE_EXPORT_CXF_CLASSPATH_CONTAINER, exportCXFClasspathContainer);
-    }
-
-    public boolean isVerbose() {
-        return getValueAsBoolean(PREFERENCE_CXF_VERBOSE);
-    }
-
-    public void setVerbose(boolean verbose) {
-        setValue(PREFERENCE_CXF_VERBOSE, true);
-    }
-
-    public boolean isUseSpringApplicationContext() {
-        return getValueAsBoolean(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT);
-    }
-
-    public void setUseSpringApplicationContext(boolean useSpringAppContext) {
-        setValue(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, useSpringAppContext);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
deleted file mode 100644
index 2e6ca29..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.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.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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSPersistentContext extends CXFPersistentContext implements Java2WSContext {
-    /**
-     * String constant used to lookup the cxf soap binding general preference
-     * from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_J2WS_SOAP12_BINDING = "cxfJ2WSSoap12Binding"; //$NON-NLS-1$
-    /**
-     * String constant used to lookup the cxf generate xsd imports general
-     * preference from the plugins local preferences store.
-     */
-    private static final String PREFERENCE_J2WS_GENERATE_XSD_IMPORTS = "cxfJ2WSXSDImports"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf default frontend general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_DEFAULT_FRONTEND = "cxfJ2WSDefaultFrontend"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf default Databinding general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_DEFAULT_DATABINDING = "cxfJ2WSDefaultDatabinding"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate client general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_CLIENT = "cxfJ2WSGenerateClient"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate server general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_SERVER = "cxfJ2WSGenerateServer"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate wrapper and fault beans
-     * general preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS = "cxfJ2WSGenerateWrapperFault"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate wsdl general preference
-     * from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_WSDL = "cxfJ2WSGenerateWSDL"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the cxf generate ant build file general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE = "cxfJ2WSGenerateANTBuildFile"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the APT annotation processing general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING 
-        = "cxfJ2WSEnableAnnotationProcessing"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@WebMethod</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION 
-        = "cxfJ2WSGenerateWebMethodAnnotation"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@WebParam</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION 
-        = "cxfJ2WSGenerateWebParamAnnotation"; //$NON-NLS-1$
- 
-    /**
-     * String constant used to lookup the generate <code>@RequestWrapper</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION 
-        = "cxfJ2WSGenerateRequestWrapperAnnotation"; //$NON-NLS-1$
-
-    /**
-     * String constant used to lookup the generate <code>@ResponseWrapper</code> annotation general
-     * preference from the plugins local preferences store.
-     */
-    public static final String PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION 
-        = "cxfJ2WSGenerateResponseWrapperAnnotation"; //$NON-NLS-1$
-
-    public Java2WSPersistentContext() {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        super.load();
-        setDefault(PREFERENCE_J2WS_SOAP12_BINDING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
-        setDefault(PREFERENCE_J2WS_DEFAULT_DATABINDING, DataBinding.JAXB.getLiteral());
-
-        setDefault(PREFERENCE_J2WS_DEFAULT_FRONTEND, Frontend.JAXWS.getLiteral());
-
-        setDefault(PREFERENCE_J2WS_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-
-        setDefault(PREFERENCE_J2WS_GENERATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
-
-        setDefault(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
-
-        //TODO MOVE THE FOLLOWING 4
-        setDefault(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                        CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-
-        setDefault(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
-    }
-
-    public boolean isSoap12Binding() {
-        return getValueAsBoolean(PREFERENCE_J2WS_SOAP12_BINDING);
-    }
-
-    public void setSoap12Binding(boolean soap12Binding) {
-        setValue(PREFERENCE_J2WS_SOAP12_BINDING, soap12Binding);
-    }
-
-    public boolean isGenerateXSDImports() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS);
-    }
-
-    public void setGenerateXSDImports(boolean generateXSDImports) {
-        setValue(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, generateXSDImports);
-    }
-
-    public DataBinding getDatabinding() {
-        return DataBinding.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_DATABINDING));
-    }
-
-    public void setDatabinding(DataBinding dataBinding) {
-        setValue(PREFERENCE_J2WS_DEFAULT_DATABINDING, dataBinding.getLiteral());
-    }
-
-    public Frontend getFrontend() {
-        return Frontend.get(getValueAsString(PREFERENCE_J2WS_DEFAULT_FRONTEND));
-    }
-
-    public void setFrontend(Frontend defaultFrontend) {
-        setValue(PREFERENCE_J2WS_DEFAULT_FRONTEND, defaultFrontend.getLiteral());
-    }
-
-    public boolean isGenerateClient() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_CLIENT);
-    }
-
-    public void setGenerateClient(boolean generateClient) {
-        setValue(PREFERENCE_J2WS_GENERATE_CLIENT, generateClient);
-    }
-
-    public boolean isGenerateServer() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_SERVER);
-    }
-
-    public void setGenerateServer(boolean generateServer) {
-        setValue(PREFERENCE_J2WS_GENERATE_SERVER, generateServer);
-    }
-
-    public boolean isGenerateWrapperFaultBeans() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS);
-    }
-
-    public void setGenerateWrapperFaultBeans(boolean generateWrapperFaultBeans) {
-        setValue(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, generateWrapperFaultBeans);
-    }
-
-    public boolean isGenerateWSDL() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_WSDL);
-    }
-
-    public void setGenerateWSDL(boolean generateWSDL) {
-        setValue(PREFERENCE_J2WS_GENERATE_WSDL, generateWSDL);
-    }
-
-    public boolean isGenerateAntBuildFile() {
-        return getValueAsBoolean(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE);
-    }
-
-    public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
-        setValue(PREFERENCE_J2WS_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
-    }
-
-    public boolean isAnnotationProcessingEnabled() {
-        return getValueAsBoolean(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING);
-    }
-
-    public boolean isGenerateWebMethodAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION);
-    }
-
-    public boolean isGenerateWebParamAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION);
-    }
-
-    public void setGenerateWebParamAnnotation(boolean generateWebParamAnnotation) {
-        setValue(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, generateWebParamAnnotation);
-    }
-    
-    public void setGenerateWebMethodAnnotation(boolean generateWebMethodAnnotation) {
-        setValue(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, generateWebMethodAnnotation);
-    }
-    
-    public void setAnnotationProcessingEnabled(boolean enableAnnotationProcessing) {
-        setValue(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, enableAnnotationProcessing);
-    }
-    
-    public boolean isGenerateRequestWrapperAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION);
-    }
-
-    public void setGenerateRequestWrapperAnnotation(boolean generateRequestWrapperAnnotation) {
-        setValue(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, generateRequestWrapperAnnotation);
-    }
-
-    public boolean isGenerateResponseWrapperAnnotation() {
-        return getValueAsBoolean(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION);
-    }
-
-    public void setGenerateResponseWrapperAnnotation(boolean generateResponseWrapperAnnotation) {
-        setValue(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, generateResponseWrapperAnnotation);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
deleted file mode 100644
index c868531..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
+++ /dev/null
@@ -1,315 +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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaPersistentContext extends CXFPersistentContext implements WSDL2JavaContext {
-    public static final String PREFERENCE_W2J_GENERATE_CLIENT = "cxfW2JGenerateClient"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_SERVER = "cxfW2JGenerateServer"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_IMPLEMENTATION = "cxfW2JGenerateImplementation"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE = "cxfW2JGenerateAntBuildFile"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_PROCESS_SOAP_HEADERS = "cxfW2JProcessSOAPHeaders"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING 
-        = "cxfW2JLoadDefaultNamespacePackagenameMapping"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING 
-        = "cxfW2JLoadDefaultExcludesNamepsaceMapping"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_VALIDATE_WSDL = "cxfW2JValidateWSDL"; //$NON-NLS-1$
-
-    public static final String PREFERENCE_W2J_DATABINDING = "cxfW2JDatabinding"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_FRONTEND = "cxfW2JFrontend"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_WSDL_VERSION = "cxfW2JWSDLVersion"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_XJC_ARGS = "cxfW2JXJCArgs"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_NO_ADDRESS_BINDING = "cxfW2JNoAddressBinding"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_USE_DEFAULT_VALUES = "cxfW2JUseDefaultValues"; //$NON-NLS-1$
-    public static final String PREFERENCE_W2J_AUTO_NAME_RESOLUTION = "cxfW2JAutoNameResolution"; //$NON-NLS-1$
-
-    public static final String XJC_USE_DEFAULT_VALUES = "xjcUseDefaultValues"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING = "xjcToString"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING_MULTI = "xjcToStringMulti"; //$NON-NLS-1$
-    public static final String XJC_TO_STRING_SIMPLE = "xjcToStringSimple"; //$NON-NLS-1$
-    public static final String XJC_LOCATOR = "xjcLocator"; //$NON-NLS-1$
-    public static final String XJC_SYNC_METHODS = "xjcSyncMethods"; //$NON-NLS-1$
-    public static final String XJC_MARK_GENERATED = "xjcMarkGenerated"; //$NON-NLS-1$
-    public static final String XJC_EPISODE_FILE = "xjcEpisodeFile"; //$NON-NLS-1$
-
-    public WSDL2JavaPersistentContext() {
-        super(CXFCorePlugin.getDefault());
-    }
-
-    public void load() {
-        super.load();
-        setDefault(PREFERENCE_W2J_GENERATE_CLIENT, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-
-        setDefault(PREFERENCE_W2J_GENERATE_SERVER, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-
-        setDefault(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-
-        setDefault(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE));
-
-        setDefault(PREFERENCE_W2J_XJC_ARGS, ""); //$NON-NLS-1$
-
-        setDefault(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                        CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, CXFModelUtils
-                .getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                        CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
-        setDefault(PREFERENCE_W2J_VALIDATE_WSDL, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE));
-
-        setDefault(PREFERENCE_W2J_DATABINDING, DataBinding.JAXB.getLiteral());
-
-        setDefault(PREFERENCE_W2J_FRONTEND, Frontend.JAXWS.getLiteral());
-
-        setDefault(PREFERENCE_W2J_WSDL_VERSION, CXFPackage.eINSTANCE.getWSDL2JavaContext_WsdlVersion()
-                .getDefaultValueLiteral());
-
-        setDefault(PREFERENCE_W2J_NO_ADDRESS_BINDING, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
-        setDefault(PREFERENCE_W2J_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
-        setDefault(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
-
-        setDefault(XJC_USE_DEFAULT_VALUES, CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-
-        setDefault(XJC_TO_STRING, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-
-        setDefault(XJC_TO_STRING_MULTI, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-
-        setDefault(XJC_TO_STRING_SIMPLE, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-
-        setDefault(XJC_LOCATOR, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-
-        setDefault(XJC_SYNC_METHODS, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-
-        setDefault(XJC_MARK_GENERATED, CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
-
-        setDefault(XJC_EPISODE_FILE, ""); //$NON-NLS-1$
-    }
-
-    public boolean isGenerateAntBuildFile() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE);
-    }
-
-    public void setGenerateAntBuildFile(boolean generateAntBuildFile) {
-        setValue(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, generateAntBuildFile);
-    }
-
-    public boolean isGenerateClient() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_CLIENT);
-    }
-
-    public void setGenerateClient(boolean generateClient) {
-        setValue(PREFERENCE_W2J_GENERATE_CLIENT, generateClient);
-    }
-
-    public boolean isGenerateImplementation() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_IMPLEMENTATION);
-    }
-
-    public void setGenerateImplementation(boolean generateImplementation) {
-        setValue(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, generateImplementation);
-    }
-
-    public boolean isGenerateServer() {
-        return getValueAsBoolean(PREFERENCE_W2J_GENERATE_SERVER);
-    }
-
-    public void setGenerateServer(boolean generateServer) {
-        setValue(PREFERENCE_W2J_GENERATE_SERVER, generateServer);
-    }
-
-    public boolean isLoadDefaultNamespacePackageNameMapping() {
-        return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING);
-    }
-
-    public void setLoadDefaultNamespacePackageNameMapping(boolean loadDefaultNamespacePackageNameMapping) {
-        setValue(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING,
-                loadDefaultNamespacePackageNameMapping);
-    }
-
-    public boolean isLoadDefaultExcludesNamepsaceMapping() {
-        return getValueAsBoolean(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
-    }
-
-    public void setLoadDefaultExcludesNamepsaceMapping(boolean loadDefaultExcludesNamepsaceMapping) {
-        setValue(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, loadDefaultExcludesNamepsaceMapping);
-    }
-
-    public boolean isProcessSOAPHeaders() {
-        return getValueAsBoolean(PREFERENCE_W2J_PROCESS_SOAP_HEADERS);
-    }
-
-    public void setProcessSOAPHeaders(boolean processSoapHeaders) {
-        setValue(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, processSoapHeaders);
-    }
-
-    public boolean isValidate() {
-        return getValueAsBoolean(PREFERENCE_W2J_VALIDATE_WSDL);
-    }
-
-    public void setValidate(boolean validate) {
-        setValue(PREFERENCE_W2J_VALIDATE_WSDL, validate);
-    }
-
-    public DataBinding getDatabinding() {
-        return DataBinding.get(getValueAsString(PREFERENCE_W2J_DATABINDING));
-    }
-
-    public void setDatabinding(DataBinding dataBinding) {
-        setValue(PREFERENCE_W2J_DATABINDING, dataBinding.getLiteral());
-    }
-
-    public Frontend getFrontend() {
-        return Frontend.get(getValueAsString(PREFERENCE_W2J_FRONTEND));
-    }
-
-    public void setFrontend(Frontend frontend) {
-        setValue(PREFERENCE_W2J_FRONTEND, frontend.getLiteral());
-    }
-
-    public String getWsdlVersion() {
-        return getValueAsString(PREFERENCE_W2J_WSDL_VERSION);
-    }
-
-    public void setWsdlVersion(String wsdlVersion) {
-        setValue(PREFERENCE_W2J_WSDL_VERSION, wsdlVersion);
-    }
-
-    public String getXjcArgs() {
-        return getValueAsString(PREFERENCE_W2J_XJC_ARGS);
-    }
-
-    public void setXjcArgs(String xjcArgs) {
-        setValue(PREFERENCE_W2J_XJC_ARGS, xjcArgs);
-    }
-
-    public boolean isNoAddressBinding() {
-        return getValueAsBoolean(PREFERENCE_W2J_NO_ADDRESS_BINDING);
-    }
-
-    public void setNoAddressBinding(boolean noAddressBinding) {
-        setValue(PREFERENCE_W2J_NO_ADDRESS_BINDING, noAddressBinding);
-    }
-    
-    public boolean isAutoNameResolution() {
-        return getValueAsBoolean(PREFERENCE_W2J_AUTO_NAME_RESOLUTION);
-    }
-
-    public void setAutoNameResolution(boolean autoNameResolution) {
-        setValue(PREFERENCE_W2J_AUTO_NAME_RESOLUTION, autoNameResolution);
-    }
-
-    public boolean isUseDefaultValues() {
-        return getValueAsBoolean(PREFERENCE_W2J_USE_DEFAULT_VALUES);
-    }
-
-    public void setUseDefaultValues(boolean useDefaultValues) {
-        setValue(PREFERENCE_W2J_USE_DEFAULT_VALUES, useDefaultValues);
-    }
-
-    
-    public boolean isXjcUseDefaultValues() {
-        return getValueAsBoolean(XJC_USE_DEFAULT_VALUES);
-    }
-
-    public void setXjcUseDefaultValues(boolean useXJCDefaultValues) {
-        setValue(XJC_USE_DEFAULT_VALUES, useXJCDefaultValues);
-    }
-
-    public boolean isXjcToString() {
-        return getValueAsBoolean(XJC_TO_STRING);
-    }
-
-    public void setXjcToString(boolean xjcToString) {
-        setValue(XJC_TO_STRING, xjcToString);
-    }
-
-    public boolean isXjcToStringMultiLine() {
-        return getValueAsBoolean(XJC_TO_STRING_MULTI);
-    }
-
-    public void setXjcToStringMultiLine(boolean xjcToStringMultiLine) {
-        setValue(XJC_TO_STRING_MULTI, xjcToStringMultiLine);
-    }
-
-    public boolean isXjcToStringSimple() {
-        return getValueAsBoolean(XJC_TO_STRING_SIMPLE);
-    }
-
-    public void setXjcToStringSimple(boolean xjcToStringSimple) {
-        setValue(XJC_TO_STRING_SIMPLE, xjcToStringSimple);
-    }
-
-    public boolean isXjcLocator() {
-        return getValueAsBoolean(XJC_LOCATOR);
-    }
-
-    public void setXjcLocator(boolean xjcLocator) {
-        setValue(XJC_LOCATOR, xjcLocator);
-    }
-
-    public boolean isXjcSyncMethods() {
-        return getValueAsBoolean(XJC_SYNC_METHODS);
-    }
-
-    public void setXjcSyncMethods(boolean xjcSyncMethods) {
-        setValue(XJC_SYNC_METHODS, xjcSyncMethods);
-    }
-
-    public boolean isXjcMarkGenerated() {
-        return getValueAsBoolean(XJC_MARK_GENERATED);
-    }
-
-    public void setXjcMarkGenerated(boolean xjcMarkGenerated) {
-        setValue(XJC_MARK_GENERATED, xjcMarkGenerated);
-    }
-
-    public String getXjcEpisodeFile() {
-        return getValueAsString(XJC_EPISODE_FILE);
-    }
-
-    public void setXjcEpisodeFile(String xjcEpisodeFile) {
-        setValue(XJC_EPISODE_FILE, xjcEpisodeFile);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
deleted file mode 100644
index 0264aec..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
+++ /dev/null
@@ -1,226 +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;
-
-/**
- * @author sclarke
- * 
- * @model abstract="true" interface="true"
- */
-public interface CXFContext {
-
-    /**
-     * Returns the CXF Home Directory location.
-     * 
-     * @model
-     */
-    String getCxfRuntimeLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Home Directory location.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Location</em>' attribute.
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     */
-    void setCxfRuntimeLocation(String value);
-
-    /**
-     * Returns the CXF Runtime Edition.
-     * 
-     * @model
-     */
-    String getCxfRuntimeEdition();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Runtime Edition.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Edition</em>' attribute.
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     */
-    void setCxfRuntimeEdition(String value);
-
-    /**
-     * Returns the CXF Tool version.
-     * 
-     * @model
-     */
-    String getCxfRuntimeVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the CXF Tool version
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Cxf Runtime Version</em>' attribute.
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     */
-    void setCxfRuntimeVersion(String value);
-
-    /**
-     * Returns whether comments are shown during the code generation process.
-     * 
-     * @model default="true"
-     */
-    boolean isVerbose();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Displays comments during the code generation process.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Verbose</em>' attribute.
-     * @see #isVerbose()
-     * @generated
-     */
-    void setVerbose(boolean value);
-
-    /**
-     * Returns whether to generate an Ant build.xml file.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateAntBuildFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Set to generate an Ant build.xml file.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Ant Build File</em>' attribute.
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     */
-    void setGenerateAntBuildFile(boolean value);
-
-    /**
-     * Returns whether to generate a client.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateClient();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate client side code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Client</em>' attribute.
-     * @see #isGenerateClient()
-     * @generated
-     */
-    void setGenerateClient(boolean value);
-
-    /**
-     * Returns whether to generate a server.
-     * 
-     * @model default="false"
-     */
-    boolean isGenerateServer();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate server side code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Server</em>' attribute.
-     * @see #isGenerateServer()
-     * @generated
-     */
-    void setGenerateServer(boolean value);
-
-    /**
-     * Returns the data binding used.
-     * 
-     * @model default="jaxb"
-     */
-    DataBinding getDatabinding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Databinding</em>' attribute.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @see #getDatabinding()
-     * @generated
-     */
-    void setDatabinding(DataBinding value);
-
-    /**
-     * Returns the frontend used.
-     * 
-     * @model default="jaxws"
-     */
-    Frontend getFrontend();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Frontend</em>' attribute.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @see #getFrontend()
-     * @generated
-     */
-    void setFrontend(Frontend value);
-
-    /**
-     * Returns if the Spring Application Context is used instead of cxf-servlet.
-     * 
-     * @model default="true"
-     */
-    boolean isUseSpringApplicationContext();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * If true the Spring Application Context is used otherwise cxf servlet.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Spring Application Context</em>' attribute.
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     */
-    void setUseSpringApplicationContext(boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * The default value is <code>"true"</code>.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Export CXF Classpath Container</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Export CXF Classpath Container</em>' attribute.
-     * @see #setExportCXFClasspathContainer(boolean)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getCXFContext_ExportCXFClasspathContainer()
-     * @model default="true"
-     * @generated
-     */
-    boolean isExportCXFClasspathContainer();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Export CXF Classpath Container</em>' attribute.
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     */
-    void setExportCXFClasspathContainer(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.java
deleted file mode 100644
index a9cba2a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFDataModel.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.model;
-
-import java.net.URL;
-import javax.wsdl.Definition;
-
-/**
- * @author sclarke
- * 
- * @model abstract="true"
- */
-public interface CXFDataModel extends CXFContext {
-    /**
-     * Returns the originating project that contains the java or wsdl resource.
-     * 
-     * @model
-     */
-    String getProjectName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the originating project that contains the java or wsdl resource.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Project Name</em>' attribute.
-     * @see #getProjectName()
-     * @generated
-     */
-    void setProjectName(String value);
-
-    /**
-     * Returns the resource directory in which the output files are placed.
-     *  
-     * @model
-     */
-    String getResourceDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the resource directory in which the output files are placed.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Resource Directory</em>' attribute.
-     * @see #getResourceDirectory()
-     * @generated
-     */
-    void setResourceDirectory(String value);
-
-    /**
-     * Returns the directory in which the generated sources are compiled into.
-     * If not specified, the files are not compiled.
-     * 
-     * @model
-     */
-    String getClassDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets directory in which the generated sources are compiled into. If not
-     * specified, the files are not compiled.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Class Directory</em>' attribute.
-     * @see #getClassDirectory()
-     * @generated
-     */
-    void setClassDirectory(String value);
-
-    /**
-     * Returns the name of the WSDL File that is used as input to WSDL2Java or
-     * is the output of Java2WS.
-     * 
-     * @model
-     */
-    String getWsdlFileName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl File Name</em>' attribute.
-     * @see #getWsdlFileName()
-     * @generated
-     */
-    void setWsdlFileName(String value);
-
-    /**
-     * Returns the WSDL URL.
-     * 
-     * @model
-     */
-    URL getWsdlURL();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl URL</em>' attribute.
-     * @see #getWsdlURL()
-     * @generated
-     */
-    void setWsdlURL(URL value);
-
-    /**
-     * Returns the wsdl location relative to the WebContent directory.
-     * Used in the spring configuration.
-     * 
-     * @model
-     */
-    String getConfigWsdlLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Config Wsdl Location</em>' attribute.
-     * @see #getConfigWsdlLocation()
-     * @generated
-     */
-    void setConfigWsdlLocation(String value);
-
-    /**
-     * Returns the Java Class that may be used as input to Java2WS or is the output
-     * of WSDL2Java.
-     * 
-     * @model
-     */
-    String getFullyQualifiedJavaClassName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the Java Class that may be used as input to Java2WS or is the output of WSDL2Java.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Fully Qualified Java Class Name</em>' attribute.
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     */
-    void setFullyQualifiedJavaClassName(String value);
-
-    /**
-     * Returns the name of the Java Interface that may be used as input to Java2WS.
-     * 
-     * @model
-     */
-    String getFullyQualifiedJavaInterfaceName();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the name of the Java Interface that may be used as input to Java2WS.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Fully Qualified Java Interface Name</em>' attribute.
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     */
-    void setFullyQualifiedJavaInterfaceName(String value);
-
-    /**
-     * Used in the CXF Spring Configuration to uniquely identify elements.
-     * 
-     * @model
-     */
-    String getConfigId();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Config Id</em>' attribute.
-     * @see #getConfigId()
-     * @generated
-     */
-    void setConfigId(String value);
-
-    /**
-     * Returns the targetNamespace.
-     * 
-     * @model
-     */
-    String getTargetNamespace();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the targetNamespace.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Target Namespace</em>' attribute.
-     * @see #getTargetNamespace()
-     * @generated
-     */
-    void setTargetNamespace(String value);
-
-    /**
-     * Returns the endointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * 
-     * @model
-     */
-    String getEndpointName();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the endpointName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Endpoint Name</em>' attribute.
-     * @see #getEndpointName()
-     * @generated
-     */
-    void setEndpointName(String value);
-
-    /**
-     * Returns the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * 
-     * @model
-     */
-    String getServiceName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the serviceName attribute used in the jaxws:endpoint element in the CXF Spring Configuration.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Service Name</em>' attribute.
-     * @see #getServiceName()
-     * @generated
-     */
-    void setServiceName(String value);
-
-    /**
-     * @model
-     */
-    Definition getWsdlDefinition();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Definition</em>' attribute.
-     * @see #getWsdlDefinition()
-     * @generated
-     */
-    void setWsdlDefinition(Definition value);
-
-    /**
-     * @model
-     */
-    String getWsdlLocation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Location</em>' attribute.
-     * @see #getWsdlLocation()
-     * @generated
-     */
-    void setWsdlLocation(String value);
-        
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
deleted file mode 100644
index 57e301b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFFactory.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public interface CXFFactory extends EFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    CXFFactory eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFFactoryImpl.init();
-
-    /**
-     * Returns a new object of class '<em>Java2 WS Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Java2 WS Data Model</em>'.
-     * @generated
-     */
-    Java2WSDataModel createJava2WSDataModel();
-
-    /**
-     * Returns a new object of class '<em>WSDL2 Java Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>WSDL2 Java Data Model</em>'.
-     * @generated
-     */
-    WSDL2JavaDataModel createWSDL2JavaDataModel();
-
-    /**
-     * Returns the package supported by this factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the package supported by this factory.
-     * @generated
-     */
-    CXFPackage getCXFPackage();
-
-} //CXFFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
deleted file mode 100644
index 2e1d5b6..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
+++ /dev/null
@@ -1,3350 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFPackage.java,v 1.3 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory
- * @model kind="package"
- * @generated
- */
-public interface CXFPackage extends EPackage {
-    /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNAME = "model";
-
-    /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNS_URI = "http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore";
-
-    /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    String eNS_PREFIX = "org.eclipse.jst.ws.internal.cxf.core.model";
-
-    /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    CXFPackage eINSTANCE = org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl.init();
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
-     * @generated
-     */
-    int CXF_CONTEXT = 0;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_LOCATION = 0;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_EDITION = 1;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__CXF_RUNTIME_VERSION = 2;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__VERBOSE = 3;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_CLIENT = 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__GENERATE_SERVER = 6;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__DATABINDING = 7;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__FRONTEND = 8;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = 9;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = 10;
-
-    /**
-     * The number of structural features of the '<em>Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT_FEATURE_COUNT = 11;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
-     * @generated
-     */
-    int CXF_DATA_MODEL = 1;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__PROJECT_NAME = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__RESOURCE_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CLASS_DIRECTORY = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_FILE_NAME = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_URL = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__CONFIG_ID = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__TARGET_NAMESPACE = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__ENDPOINT_NAME = CXF_CONTEXT_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__SERVICE_NAME = CXF_CONTEXT_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_DEFINITION = CXF_CONTEXT_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL__WSDL_LOCATION = CXF_CONTEXT_FEATURE_COUNT + 13;
-
-    /**
-     * The number of structural features of the '<em>Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_DATA_MODEL_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 14;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
-     * @generated
-     */
-    int JAVA2_WS_CONTEXT = 2;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__SOAP12_BINDING = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WSDL = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The number of structural features of the '<em>Java2 WS Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
-     * @generated
-     */
-    int JAVA2_WS_DATA_MODEL = 3;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Soap12 Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SOAP12_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Generate XSD Imports</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Generate WSDL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WSDL = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Annotation Processing Enabled</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Method Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Generate Web Param Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Classpath</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__CLASSPATH = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Java Starting Point</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Use Service Endpoint Interface</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Extract Interface</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Service Endpoint Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Method Map</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__METHOD_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Annotation Map</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Source Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Port Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL__PORT_NAME = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
-    /**
-     * The number of structural features of the '<em>Java2 WS Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int JAVA2_WS_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
-     * @generated
-     */
-    int WSDL2_JAVA_CONTEXT = 4;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_LOCATION = CXF_CONTEXT__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_EDITION = CXF_CONTEXT__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__CXF_RUNTIME_VERSION = CXF_CONTEXT__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__VERBOSE = CXF_CONTEXT__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE = CXF_CONTEXT__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_CLIENT = CXF_CONTEXT__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_SERVER = CXF_CONTEXT__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__DATABINDING = CXF_CONTEXT__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__FRONTEND = CXF_CONTEXT__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = CXF_CONTEXT_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = CXF_CONTEXT_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_CONTEXT_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Validate</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__VALIDATE = CXF_CONTEXT_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__WSDL_VERSION = CXF_CONTEXT_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_ARGS = CXF_CONTEXT_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = CXF_CONTEXT_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = CXF_CONTEXT_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING = CXF_CONTEXT_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = CXF_CONTEXT_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = CXF_CONTEXT_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_LOCATOR = CXF_CONTEXT_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = CXF_CONTEXT_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = CXF_CONTEXT_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = CXF_CONTEXT_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = CXF_CONTEXT_FEATURE_COUNT + 17;
-
-    /**
-     * The number of structural features of the '<em>WSDL2 Java Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_CONTEXT_FEATURE_COUNT = CXF_CONTEXT_FEATURE_COUNT + 18;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
-     * @generated
-     */
-    int WSDL2_JAVA_DATA_MODEL = 5;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_LOCATION = CXF_DATA_MODEL__CXF_RUNTIME_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Edition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_EDITION = CXF_DATA_MODEL__CXF_RUNTIME_EDITION;
-
-    /**
-     * The feature id for the '<em><b>Cxf Runtime Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CXF_RUNTIME_VERSION = CXF_DATA_MODEL__CXF_RUNTIME_VERSION;
-
-    /**
-     * The feature id for the '<em><b>Verbose</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__VERBOSE = CXF_DATA_MODEL__VERBOSE;
-
-    /**
-     * The feature id for the '<em><b>Generate Ant Build File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_ANT_BUILD_FILE = CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE;
-
-    /**
-     * The feature id for the '<em><b>Generate Client</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_CLIENT = CXF_DATA_MODEL__GENERATE_CLIENT;
-
-    /**
-     * The feature id for the '<em><b>Generate Server</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_SERVER = CXF_DATA_MODEL__GENERATE_SERVER;
-
-    /**
-     * The feature id for the '<em><b>Databinding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__DATABINDING = CXF_DATA_MODEL__DATABINDING;
-
-    /**
-     * The feature id for the '<em><b>Frontend</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FRONTEND = CXF_DATA_MODEL__FRONTEND;
-
-    /**
-     * The feature id for the '<em><b>Use Spring Application Context</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT = CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT;
-
-    /**
-     * The feature id for the '<em><b>Export CXF Classpath Container</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER = CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER;
-
-    /**
-     * The feature id for the '<em><b>Project Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__PROJECT_NAME = CXF_DATA_MODEL__PROJECT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Resource Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__RESOURCE_DIRECTORY = CXF_DATA_MODEL__RESOURCE_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Class Directory</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CLASS_DIRECTORY = CXF_DATA_MODEL__CLASS_DIRECTORY;
-
-    /**
-     * The feature id for the '<em><b>Wsdl File Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_FILE_NAME = CXF_DATA_MODEL__WSDL_FILE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl URL</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_URL = CXF_DATA_MODEL__WSDL_URL;
-
-    /**
-     * The feature id for the '<em><b>Config Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CONFIG_WSDL_LOCATION = CXF_DATA_MODEL__CONFIG_WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME;
-
-    /**
-     * The feature id for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Config Id</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CONFIG_ID = CXF_DATA_MODEL__CONFIG_ID;
-
-    /**
-     * The feature id for the '<em><b>Target Namespace</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__TARGET_NAMESPACE = CXF_DATA_MODEL__TARGET_NAMESPACE;
-
-    /**
-     * The feature id for the '<em><b>Endpoint Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__ENDPOINT_NAME = CXF_DATA_MODEL__ENDPOINT_NAME;
-
-    /**
-     * The feature id for the '<em><b>Service Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__SERVICE_NAME = CXF_DATA_MODEL__SERVICE_NAME;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Definition</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_DEFINITION = CXF_DATA_MODEL__WSDL_DEFINITION;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Location</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_LOCATION = CXF_DATA_MODEL__WSDL_LOCATION;
-
-    /**
-     * The feature id for the '<em><b>Generate Implementation</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION = CXF_DATA_MODEL_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Process SOAP Headers</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS = CXF_DATA_MODEL_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = CXF_DATA_MODEL_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Validate</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__VALIDATE = CXF_DATA_MODEL_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Wsdl Version</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__WSDL_VERSION = CXF_DATA_MODEL_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Xjc Args</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_ARGS = CXF_DATA_MODEL_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>No Address Binding</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING = CXF_DATA_MODEL_FEATURE_COUNT + 8;
-
-    /**
-     * The feature id for the '<em><b>Xjc Use Default Values</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES = CXF_DATA_MODEL_FEATURE_COUNT + 9;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING = CXF_DATA_MODEL_FEATURE_COUNT + 10;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Multi Line</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE = CXF_DATA_MODEL_FEATURE_COUNT + 11;
-
-    /**
-     * The feature id for the '<em><b>Xjc To String Simple</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE = CXF_DATA_MODEL_FEATURE_COUNT + 12;
-
-    /**
-     * The feature id for the '<em><b>Xjc Locator</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR = CXF_DATA_MODEL_FEATURE_COUNT + 13;
-
-    /**
-     * The feature id for the '<em><b>Xjc Sync Methods</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS = CXF_DATA_MODEL_FEATURE_COUNT + 14;
-
-    /**
-     * The feature id for the '<em><b>Xjc Mark Generated</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED = CXF_DATA_MODEL_FEATURE_COUNT + 15;
-
-    /**
-     * The feature id for the '<em><b>Xjc Episode File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 16;
-
-    /**
-     * The feature id for the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION = CXF_DATA_MODEL_FEATURE_COUNT + 17;
-
-    /**
-     * The feature id for the '<em><b>Included Namespaces</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 18;
-
-    /**
-     * The feature id for the '<em><b>Binding Files</b></em>' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__BINDING_FILES = CXF_DATA_MODEL_FEATURE_COUNT + 19;
-
-    /**
-     * The feature id for the '<em><b>Excluded Namespaces</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = CXF_DATA_MODEL_FEATURE_COUNT + 20;
-
-    /**
-     * The feature id for the '<em><b>Catalog File</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = CXF_DATA_MODEL_FEATURE_COUNT + 21;
-
-    /**
-     * The feature id for the '<em><b>Java Source Folder</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = CXF_DATA_MODEL_FEATURE_COUNT + 22;
-
-    /**
-     * The number of structural features of the '<em>WSDL2 Java Data Model</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int WSDL2_JAVA_DATA_MODEL_FEATURE_COUNT = CXF_DATA_MODEL_FEATURE_COUNT + 23;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
-     * @generated
-     */
-    int FRONTEND = 6;
-
-    /**
-     * The meta object id for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
-     * @generated
-     */
-    int DATA_BINDING = 7;
-
-    /**
-     * The meta object id for the '<em>URL</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see java.net.URL
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
-     * @generated
-     */
-    int URL = 8;
-
-    /**
-     * The meta object id for the '<em>Definition</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.wsdl.Definition
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
-     * @generated
-     */
-    int DEFINITION = 9;
-
-    /**
-     * The meta object id for the '<em>Map</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see java.util.Map
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
-     * @generated
-     */
-    int MAP = 10;
-
-    /**
-     * The meta object id for the '<em>IMethod</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.jdt.core.IMethod
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
-     * @generated
-     */
-    int IMETHOD = 11;
-
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @generated
-     */
-    EClass getCXFContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeLocation()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeLocation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Edition</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeEdition()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeEdition();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Cxf Runtime Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getCxfRuntimeVersion()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_CxfRuntimeVersion();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose <em>Verbose</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Verbose</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isVerbose()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Verbose();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile <em>Generate Ant Build File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Ant Build File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateAntBuildFile()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateAntBuildFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient <em>Generate Client</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Client</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateClient()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateClient();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer <em>Generate Server</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Server</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isGenerateServer()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_GenerateServer();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding <em>Databinding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Databinding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getDatabinding()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Databinding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend <em>Frontend</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Frontend</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#getFrontend()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_Frontend();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext <em>Use Spring Application Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Spring Application Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isUseSpringApplicationContext()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_UseSpringApplicationContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Export CXF Classpath Container</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext#isExportCXFClasspathContainer()
-     * @see #getCXFContext()
-     * @generated
-     */
-    EAttribute getCXFContext_ExportCXFClasspathContainer();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
-     * @generated
-     */
-    EClass getCXFDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName <em>Project Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Project Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getProjectName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ProjectName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory <em>Resource Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Resource Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getResourceDirectory()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ResourceDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory <em>Class Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Class Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getClassDirectory()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ClassDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName <em>Wsdl File Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl File Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlFileName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlFileName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL <em>Wsdl URL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl URL</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlURL()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlURL();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation <em>Config Wsdl Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Config Wsdl Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigWsdlLocation()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ConfigWsdlLocation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Fully Qualified Java Class Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaClassName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_FullyQualifiedJavaClassName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Fully Qualified Java Interface Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getFullyQualifiedJavaInterfaceName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId <em>Config Id</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Config Id</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getConfigId()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ConfigId();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace <em>Target Namespace</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Target Namespace</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getTargetNamespace()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_TargetNamespace();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName <em>Endpoint Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Endpoint Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getEndpointName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_EndpointName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName <em>Service Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Service Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getServiceName()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_ServiceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition <em>Wsdl Definition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Definition</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlDefinition()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlDefinition();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation <em>Wsdl Location</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Location</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel#getWsdlLocation()
-     * @see #getCXFDataModel()
-     * @generated
-     */
-    EAttribute getCXFDataModel_WsdlLocation();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Java2 WS Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @generated
-     */
-    EClass getJava2WSContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Soap12 Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_Soap12Binding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate XSD Imports</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateXSDImports();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate WSDL</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWSDL();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Wrapper Fault Beans</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWrapperFaultBeans();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Annotation Processing Enabled</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_AnnotationProcessingEnabled();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Web Method Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWebMethodAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Web Param Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateWebParamAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Request Wrapper Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Response Wrapper Annotation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation()
-     * @see #getJava2WSContext()
-     * @generated
-     */
-    EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Java2 WS Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
-     * @generated
-     */
-    EClass getJava2WSDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Classpath</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_Classpath();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Java Starting Point</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_JavaStartingPoint();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Service Endpoint Interface</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_UseServiceEndpointInterface();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Extract Interface</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_ExtractInterface();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Service Endpoint Interface Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Method Map</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_MethodMap();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Annotation Map</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_AnnotationMap();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Source Directory</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_SourceDirectory();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Port Name</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName()
-     * @see #getJava2WSDataModel()
-     * @generated
-     */
-    EAttribute getJava2WSDataModel_PortName();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>WSDL2 Java Context</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @generated
-     */
-    EClass getWSDL2JavaContext();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Generate Implementation</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_GenerateImplementation();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Process SOAP Headers</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_ProcessSOAPHeaders();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Load Default Namespace Package Name Mapping</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Load Default Excludes Namepsace Mapping</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Validate</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_Validate();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Wsdl Version</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_WsdlVersion();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use Default Values</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_UseDefaultValues();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Args</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcArgs();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>No Address Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_NoAddressBinding();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Use Default Values</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcUseDefaultValues();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToString();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String Multi Line</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToStringMultiLine();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc To String Simple</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcToStringSimple();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Locator</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcLocator();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Sync Methods</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcSyncMethods();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Mark Generated</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcMarkGenerated();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Xjc Episode File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_XjcEpisodeFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Auto Name Resolution</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution()
-     * @see #getWSDL2JavaContext()
-     * @generated
-     */
-    EAttribute getWSDL2JavaContext_AutoNameResolution();
-
-    /**
-     * Returns the meta object for class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>WSDL2 Java Data Model</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
-     * @generated
-     */
-    EClass getWSDL2JavaDataModel();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Included Namespaces</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_IncludedNamespaces();
-
-    /**
-     * Returns the meta object for the attribute list '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles <em>Binding Files</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute list '<em>Binding Files</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getBindingFiles()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_BindingFiles();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Excluded Namespaces</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_ExcludedNamespaces();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Catalog File</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_CatalogFile();
-
-    /**
-     * Returns the meta object for the attribute '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Java Source Folder</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder()
-     * @see #getWSDL2JavaDataModel()
-     * @generated
-     */
-    EAttribute getWSDL2JavaDataModel_JavaSourceFolder();
-
-    /**
-     * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Frontend</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-     * @generated
-     */
-    EEnum getFrontend();
-
-    /**
-     * Returns the meta object for enum '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Data Binding</em>'.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-     * @generated
-     */
-    EEnum getDataBinding();
-
-    /**
-     * Returns the meta object for data type '{@link java.net.URL <em>URL</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>URL</em>'.
-     * @see java.net.URL
-     * @model instanceClass="java.net.URL"
-     * @generated
-     */
-    EDataType getURL();
-
-    /**
-     * Returns the meta object for data type '{@link javax.wsdl.Definition <em>Definition</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Definition</em>'.
-     * @see javax.wsdl.Definition
-     * @model instanceClass="javax.wsdl.Definition"
-     * @generated
-     */
-    EDataType getDefinition();
-
-    /**
-     * Returns the meta object for data type '{@link java.util.Map <em>Map</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Map</em>'.
-     * @see java.util.Map
-     * @model instanceClass="java.util.Map" typeParameters="T T1"
-     * @generated
-     */
-    EDataType getMap();
-
-    /**
-     * Returns the meta object for data type '{@link org.eclipse.jdt.core.IMethod <em>IMethod</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>IMethod</em>'.
-     * @see org.eclipse.jdt.core.IMethod
-     * @model instanceClass="org.eclipse.jdt.core.IMethod"
-     * @generated
-     */
-    EDataType getIMethod();
-
-    /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
-    CXFFactory getCXFFactory();
-
-    /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
-     * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
-     * </ul>
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    interface Literals {
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFContext()
-         * @generated
-         */
-        EClass CXF_CONTEXT = eINSTANCE.getCXFContext();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_LOCATION = eINSTANCE.getCXFContext_CxfRuntimeLocation();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Edition</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_EDITION = eINSTANCE.getCXFContext_CxfRuntimeEdition();
-
-        /**
-         * The meta object literal for the '<em><b>Cxf Runtime Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__CXF_RUNTIME_VERSION = eINSTANCE.getCXFContext_CxfRuntimeVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Verbose</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__VERBOSE = eINSTANCE.getCXFContext_Verbose();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Ant Build File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_ANT_BUILD_FILE = eINSTANCE.getCXFContext_GenerateAntBuildFile();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Client</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_CLIENT = eINSTANCE.getCXFContext_GenerateClient();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Server</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__GENERATE_SERVER = eINSTANCE.getCXFContext_GenerateServer();
-
-        /**
-         * The meta object literal for the '<em><b>Databinding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__DATABINDING = eINSTANCE.getCXFContext_Databinding();
-
-        /**
-         * The meta object literal for the '<em><b>Frontend</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__FRONTEND = eINSTANCE.getCXFContext_Frontend();
-
-        /**
-         * The meta object literal for the '<em><b>Use Spring Application Context</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT = eINSTANCE.getCXFContext_UseSpringApplicationContext();
-
-        /**
-         * The meta object literal for the '<em><b>Export CXF Classpath Container</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER = eINSTANCE.getCXFContext_ExportCXFClasspathContainer();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl <em>Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getCXFDataModel()
-         * @generated
-         */
-        EClass CXF_DATA_MODEL = eINSTANCE.getCXFDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__PROJECT_NAME = eINSTANCE.getCXFDataModel_ProjectName();
-
-        /**
-         * The meta object literal for the '<em><b>Resource Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__RESOURCE_DIRECTORY = eINSTANCE.getCXFDataModel_ResourceDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Class Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CLASS_DIRECTORY = eINSTANCE.getCXFDataModel_ClassDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl File Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_FILE_NAME = eINSTANCE.getCXFDataModel_WsdlFileName();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl URL</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_URL = eINSTANCE.getCXFDataModel_WsdlURL();
-
-        /**
-         * The meta object literal for the '<em><b>Config Wsdl Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CONFIG_WSDL_LOCATION = eINSTANCE.getCXFDataModel_ConfigWsdlLocation();
-
-        /**
-         * The meta object literal for the '<em><b>Fully Qualified Java Class Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaClassName();
-
-        /**
-         * The meta object literal for the '<em><b>Fully Qualified Java Interface Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME = eINSTANCE.getCXFDataModel_FullyQualifiedJavaInterfaceName();
-
-        /**
-         * The meta object literal for the '<em><b>Config Id</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__CONFIG_ID = eINSTANCE.getCXFDataModel_ConfigId();
-
-        /**
-         * The meta object literal for the '<em><b>Target Namespace</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__TARGET_NAMESPACE = eINSTANCE.getCXFDataModel_TargetNamespace();
-
-        /**
-         * The meta object literal for the '<em><b>Endpoint Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__ENDPOINT_NAME = eINSTANCE.getCXFDataModel_EndpointName();
-
-        /**
-         * The meta object literal for the '<em><b>Service Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__SERVICE_NAME = eINSTANCE.getCXFDataModel_ServiceName();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Definition</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_DEFINITION = eINSTANCE.getCXFDataModel_WsdlDefinition();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Location</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute CXF_DATA_MODEL__WSDL_LOCATION = eINSTANCE.getCXFDataModel_WsdlLocation();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSContext()
-         * @generated
-         */
-        EClass JAVA2_WS_CONTEXT = eINSTANCE.getJava2WSContext();
-
-        /**
-         * The meta object literal for the '<em><b>Soap12 Binding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__SOAP12_BINDING = eINSTANCE.getJava2WSContext_Soap12Binding();
-
-        /**
-         * The meta object literal for the '<em><b>Generate XSD Imports</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS = eINSTANCE.getJava2WSContext_GenerateXSDImports();
-
-        /**
-         * The meta object literal for the '<em><b>Generate WSDL</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WSDL = eINSTANCE.getJava2WSContext_GenerateWSDL();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Wrapper Fault Beans</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS = eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans();
-
-        /**
-         * The meta object literal for the '<em><b>Annotation Processing Enabled</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED = eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Web Method Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Web Param Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Request Wrapper Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Response Wrapper Annotation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION = eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl <em>Java2 WS Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getJava2WSDataModel()
-         * @generated
-         */
-        EClass JAVA2_WS_DATA_MODEL = eINSTANCE.getJava2WSDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Classpath</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__CLASSPATH = eINSTANCE.getJava2WSDataModel_Classpath();
-
-        /**
-         * The meta object literal for the '<em><b>Java Starting Point</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT = eINSTANCE.getJava2WSDataModel_JavaStartingPoint();
-
-        /**
-         * The meta object literal for the '<em><b>Use Service Endpoint Interface</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE = eINSTANCE.getJava2WSDataModel_UseServiceEndpointInterface();
-
-        /**
-         * The meta object literal for the '<em><b>Extract Interface</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE = eINSTANCE.getJava2WSDataModel_ExtractInterface();
-
-        /**
-         * The meta object literal for the '<em><b>Service Endpoint Interface Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME = eINSTANCE.getJava2WSDataModel_ServiceEndpointInterfaceName();
-
-        /**
-         * The meta object literal for the '<em><b>Method Map</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__METHOD_MAP = eINSTANCE.getJava2WSDataModel_MethodMap();
-
-        /**
-         * The meta object literal for the '<em><b>Annotation Map</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__ANNOTATION_MAP = eINSTANCE.getJava2WSDataModel_AnnotationMap();
-
-        /**
-         * The meta object literal for the '<em><b>Source Directory</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY = eINSTANCE.getJava2WSDataModel_SourceDirectory();
-
-        /**
-         * The meta object literal for the '<em><b>Port Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute JAVA2_WS_DATA_MODEL__PORT_NAME = eINSTANCE.getJava2WSDataModel_PortName();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaContext()
-         * @generated
-         */
-        EClass WSDL2_JAVA_CONTEXT = eINSTANCE.getWSDL2JavaContext();
-
-        /**
-         * The meta object literal for the '<em><b>Generate Implementation</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION = eINSTANCE.getWSDL2JavaContext_GenerateImplementation();
-
-        /**
-         * The meta object literal for the '<em><b>Process SOAP Headers</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS = eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders();
-
-        /**
-         * The meta object literal for the '<em><b>Load Default Namespace Package Name Mapping</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Load Default Excludes Namepsace Mapping</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING = eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Validate</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__VALIDATE = eINSTANCE.getWSDL2JavaContext_Validate();
-
-        /**
-         * The meta object literal for the '<em><b>Wsdl Version</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__WSDL_VERSION = eINSTANCE.getWSDL2JavaContext_WsdlVersion();
-
-        /**
-         * The meta object literal for the '<em><b>Use Default Values</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_UseDefaultValues();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Args</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_ARGS = eINSTANCE.getWSDL2JavaContext_XjcArgs();
-
-        /**
-         * The meta object literal for the '<em><b>No Address Binding</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING = eINSTANCE.getWSDL2JavaContext_NoAddressBinding();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Use Default Values</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES = eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING = eINSTANCE.getWSDL2JavaContext_XjcToString();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String Multi Line</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE = eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc To String Simple</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE = eINSTANCE.getWSDL2JavaContext_XjcToStringSimple();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Locator</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_LOCATOR = eINSTANCE.getWSDL2JavaContext_XjcLocator();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Sync Methods</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS = eINSTANCE.getWSDL2JavaContext_XjcSyncMethods();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Mark Generated</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED = eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated();
-
-        /**
-         * The meta object literal for the '<em><b>Xjc Episode File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE = eINSTANCE.getWSDL2JavaContext_XjcEpisodeFile();
-
-        /**
-         * The meta object literal for the '<em><b>Auto Name Resolution</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION = eINSTANCE.getWSDL2JavaContext_AutoNameResolution();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl <em>WSDL2 Java Data Model</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getWSDL2JavaDataModel()
-         * @generated
-         */
-        EClass WSDL2_JAVA_DATA_MODEL = eINSTANCE.getWSDL2JavaDataModel();
-
-        /**
-         * The meta object literal for the '<em><b>Included Namespaces</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_IncludedNamespaces();
-
-        /**
-         * The meta object literal for the '<em><b>Binding Files</b></em>' attribute list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__BINDING_FILES = eINSTANCE.getWSDL2JavaDataModel_BindingFiles();
-
-        /**
-         * The meta object literal for the '<em><b>Excluded Namespaces</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES = eINSTANCE.getWSDL2JavaDataModel_ExcludedNamespaces();
-
-        /**
-         * The meta object literal for the '<em><b>Catalog File</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__CATALOG_FILE = eINSTANCE.getWSDL2JavaDataModel_CatalogFile();
-
-        /**
-         * The meta object literal for the '<em><b>Java Source Folder</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        EAttribute WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER = eINSTANCE.getWSDL2JavaDataModel_JavaSourceFolder();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Frontend <em>Frontend</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.Frontend
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getFrontend()
-         * @generated
-         */
-        EEnum FRONTEND = eINSTANCE.getFrontend();
-
-        /**
-         * The meta object literal for the '{@link org.eclipse.jst.ws.internal.cxf.core.model.DataBinding <em>Data Binding</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.DataBinding
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDataBinding()
-         * @generated
-         */
-        EEnum DATA_BINDING = eINSTANCE.getDataBinding();
-
-        /**
-         * The meta object literal for the '<em>URL</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.net.URL
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getURL()
-         * @generated
-         */
-        EDataType URL = eINSTANCE.getURL();
-
-        /**
-         * The meta object literal for the '<em>Definition</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see javax.wsdl.Definition
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getDefinition()
-         * @generated
-         */
-        EDataType DEFINITION = eINSTANCE.getDefinition();
-
-        /**
-         * The meta object literal for the '<em>Map</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see java.util.Map
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getMap()
-         * @generated
-         */
-        EDataType MAP = eINSTANCE.getMap();
-
-        /**
-         * The meta object literal for the '<em>IMethod</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.eclipse.jdt.core.IMethod
-         * @see org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFPackageImpl#getIMethod()
-         * @generated
-         */
-        EDataType IMETHOD = eINSTANCE.getIMethod();
-
-    }
-
-} //CXFPackage
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
deleted file mode 100644
index 6d1fb16..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/DataBinding.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: DataBinding.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Data Binding</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getDataBinding()
- * @model
- * @generated
- */
-public enum DataBinding implements Enumerator {
-    /**
-     * The '<em><b>JAXB</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #JAXB_VALUE
-     * @generated
-     * @ordered
-     */
-    JAXB(0, "JAXB", "jaxb");
-
-    /**
-     * The '<em><b>JAXB</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>JAXB</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #JAXB
-     * @model literal="jaxb"
-     * @generated
-     * @ordered
-     */
-    public static final int JAXB_VALUE = 0;
-
-    /**
-     * An array of all the '<em><b>Data Binding</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static final DataBinding[] VALUES_ARRAY =
-        new DataBinding[] {
-            JAXB,
-        };
-
-    /**
-     * A public read-only list of all the '<em><b>Data Binding</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final List<DataBinding> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding get(String literal) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            DataBinding result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding getByName(String name) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            DataBinding result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Data Binding</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static DataBinding get(int value) {
-        switch (value) {
-            case JAXB_VALUE: return JAXB;
-        }
-        return null;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final int value;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String name;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String literal;
-
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private DataBinding(int value, String name, String literal) {
-        this.value = value;
-        this.name = name;
-        this.literal = literal;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int getValue() {
-      return value;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-      return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getLiteral() {
-      return literal;
-    }
-
-    /**
-     * Returns the literal value of the enumerator, which is its string representation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        return literal;
-    }
-    
-} //DataBinding
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
deleted file mode 100644
index 44a9a0e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Frontend.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: Frontend.java,v 1.1 2008/11/10 20:37:43 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Frontend</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getFrontend()
- * @model
- * @generated
- */
-public enum Frontend implements Enumerator {
-    /**
-     * The '<em><b>JAXWS</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #JAXWS_VALUE
-     * @generated
-     * @ordered
-     */
-    JAXWS(0, "JAXWS", "jaxws");
-
-    /**
-     * The '<em><b>JAXWS</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>JAXWS</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #JAXWS
-     * @model literal="jaxws"
-     * @generated
-     * @ordered
-     */
-    public static final int JAXWS_VALUE = 0;
-
-    /**
-     * An array of all the '<em><b>Frontend</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static final Frontend[] VALUES_ARRAY =
-        new Frontend[] {
-            JAXWS,
-        };
-
-    /**
-     * A public read-only list of all the '<em><b>Frontend</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final List<Frontend> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend get(String literal) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Frontend result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend getByName(String name) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            Frontend result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Frontend</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static Frontend get(int value) {
-        switch (value) {
-            case JAXWS_VALUE: return JAXWS;
-        }
-        return null;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final int value;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String name;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private final String literal;
-
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private Frontend(int value, String name, String literal) {
-        this.value = value;
-        this.name = name;
-        this.literal = literal;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int getValue() {
-      return value;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-      return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getLiteral() {
-      return literal;
-    }
-
-    /**
-     * Returns the literal value of the enumerator, which is its string representation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        return literal;
-    }
-    
-} //Frontend
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java
deleted file mode 100644
index 01323c2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSContext.java
+++ /dev/null
@@ -1,182 +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;
-
-/**
- * @author sclarke
- * 
- * @model abstract="true" interface="true"
- */
-public interface Java2WSContext extends CXFContext {
-    /**
-     * Returns whether the generated WSDL is to include a SOAP 1.2 binding.
-     * 
-     * @model default="false"
-     */
-    boolean isSoap12Binding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isSoap12Binding <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies that the generated WSDL is to include a SOAP 1.2 binding.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Soap12 Binding</em>' attribute.
-     * @see #isSoap12Binding()
-     * @generated
-     */
-    void setSoap12Binding(boolean value);
-
-    /**
-     * Returns whether to output schemas to separate files and use imports to
-     * load them instead of inlining them into the wsdl.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateXSDImports();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateXSDImports <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Output schemas to separate files and use imports to load them instead of
-     * inlining them into the wsdl.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate XSD Imports</em>' attribute.
-     * @see #isGenerateXSDImports()
-     * @generated
-     */
-    void setGenerateXSDImports(boolean value);
-
-    /**
-     * Returns whether to generate wsdl.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWSDL();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWSDL <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate the WSDL file.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate WSDL</em>' attribute.
-     * @see #isGenerateWSDL()
-     * @generated
-     */
-    void setGenerateWSDL(boolean value);
-
-    /**
-     * Returns whether to generate wrapper beans.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWrapperFaultBeans();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify to generate the wrapper and fault bean.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Wrapper Fault Beans</em>' attribute.
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     */
-    void setGenerateWrapperFaultBeans(boolean value);
-
-    /**
-     * Returns whether the Annotation Processing Tool (APT) is enabled.
-     * 
-     * @model default="false"
-     */
-    boolean isAnnotationProcessingEnabled();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Set to enable the Annotation Processing Tool (APT) extension.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Annotation Processing Enabled</em>' attribute.
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     */
-    void setAnnotationProcessingEnabled(boolean value);
-
-    /**
-     * Returns whether the <code>@WebMethod</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWebMethodAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@WebMethod</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Web Method Annotation</em>' attribute.
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     */
-    void setGenerateWebMethodAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@WebParam</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateWebParamAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@WebParam</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Web Param Annotation</em>' attribute.
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     */
-    void setGenerateWebParamAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@RequestWrapper</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateRequestWrapperAnnotation();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@RequestWrapper</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Request Wrapper Annotation</em>' attribute.
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     */
-    void setGenerateRequestWrapperAnnotation(boolean value);
-
-    /**
-     * Returns whether the <code>@ResponseWrapper</code> annotation generation is enabled by default.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateResponseWrapperAnnotation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the enablement of the <code>@ResponseWrapper</code> annotation generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Response Wrapper Annotation</em>' attribute.
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     */
-    void setGenerateResponseWrapperAnnotation(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java
deleted file mode 100644
index b126abf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/Java2WSDataModel.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-
-/**
- * @author sclarke
- * 
- * @model
- */
-public interface Java2WSDataModel extends CXFDataModel, Java2WSContext {
-    /**
-     * Returns the classpath searched when processing.
-     * 
-     * @model
-     */
-    String getClasspath();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getClasspath <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the classpath to search when processing.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Classpath</em>' attribute.
-     * @see #getClasspath()
-     * @generated
-     */
-    void setClasspath(String value);
-
-    /**
-     * Returns the Java starting point artifact. This can be either a Java Class or Interface.
-     * 
-     * @model
-     */
-    String getJavaStartingPoint();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getJavaStartingPoint <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the Java starting point artifact. It may be a Java Class or Interface.
-     * @see #setFullyQualifiedJavaClassName()
-     * @see #setFullyQualifiedJavaInterfaceName()
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Java Starting Point</em>' attribute.
-     * @see #getJavaStartingPoint()
-     * @generated
-     */
-    void setJavaStartingPoint(String value);
-
-    /**
-     * If the starting point is a Java Class this tracks whether to use an SEI has been selected.
-     * 
-     * @model
-     */
-    boolean isUseServiceEndpointInterface();
-
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Service Endpoint Interface</em>' attribute.
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     */
-    void setUseServiceEndpointInterface(boolean value);
-
-    /**
-     * If the starting point is a Java Class this tracks whether to option to
-     * extract the SEI has been selected.
-     * 
-     * @model
-     */
-    boolean isExtractInterface();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#isExtractInterface <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the option to extract the SEI from the Java class starting point.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Extract Interface</em>' attribute.
-     * @see #isExtractInterface()
-     * @generated
-     */
-    void setExtractInterface(boolean value);
-
-    /**
-     * Gets the new SEI name.
-     * 
-     * @model
-     */
-    String getServiceEndpointInterfaceName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Service Endpoint Interface Name</em>' attribute.
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     */
-    void setServiceEndpointInterfaceName(String value);
-
-    /**
-     * Returns the map of the methods to use and their annotations.
-     * 
-     * @model
-     */
-    Map<IMethod, Map<String, Boolean>> getMethodMap();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getMethodMap <em>Method Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the map of the methods to use and the method annotations.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Method Map</em>' attribute.
-     * @see #getMethodMap()
-     * @generated
-     */
-    void setMethodMap(Map<IMethod, Map<String, Boolean>> value);
-
-    /**
-     * Returns a map of enabled default method annotations
-     * 
-     * @model
-     */
-    Map<String, Boolean> getAnnotationMap();
-    
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getAnnotationMap <em>Annotation Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets a map of the enabled method annotations.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Annotation Map</em>' attribute.
-     * @see #getAnnotationMap()
-     * @generated
-     */
-    void setAnnotationMap(Map<String, Boolean> value);
-
-    /**
-     * Returns the directory in which the generated source files are placed.
-     * 
-     * @model
-     */
-    String getSourceDirectory();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getSourceDirectory <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the directory in which the generated source files are placed.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Source Directory</em>' attribute.
-     * @see #getSourceDirectory()
-     * @generated
-     */
-    void setSourceDirectory(String value);
-
-    /**
-     * Returns the port name used in the generated wsdl.
-     * 
-     * @model
-     */
-    String getPortName();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel#getPortName <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the port name to use in the generated wsdl.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Port Name</em>' attribute.
-     * @see #getPortName()
-     * @generated
-     */
-    void setPortName(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
deleted file mode 100644
index b45f258..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
+++ /dev/null
@@ -1,352 +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;
-
-/**
- * @author sclarke
- * 
- * @model abstract="true" interface="true"
- */
-public interface WSDL2JavaContext extends CXFContext {
-
-    /**
-     * Returns whether to generate starting point code for an implementation object.
-     * 
-     * @model default="true"
-     */
-    boolean isGenerateImplementation();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isGenerateImplementation <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies whether to generate starting point code for an implementation object.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Generate Implementation</em>' attribute.
-     * @see #isGenerateImplementation()
-     * @generated
-     */
-    void setGenerateImplementation(boolean value);
-
-    /**
-     * Returns whether processing of implicit SOAP headers (i.e. SOAP headers
-     * defined in the wsdl:binding but not wsdl:portType section.) is enabled.
-     * 
-     * @model default="false"
-     */
-    boolean isProcessSOAPHeaders();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isProcessSOAPHeaders <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables or disables processing of implicit SOAP headers (i.e. SOAP
-     * headers defined in the wsdl:binding but not wsdl:portType section.)
-     * Default is false.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Process SOAP Headers</em>' attribute.
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     */
-    void setProcessSOAPHeaders(boolean value);
-
-    /**
-     * Returns whether the loading of the default namespace package name mapping is enabled. 
-     * Default is true.
-     * 
-     * @model default="true"
-     */
-    boolean isLoadDefaultNamespacePackageNameMapping();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables the use of the default namespace package name mapping.
-     * Default is true.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Load Default Namespace Package Name Mapping</em>' attribute.
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     */
-    void setLoadDefaultNamespacePackageNameMapping(boolean value);
-
-    /**
-     * Returns whether the loading of the default excludes namespace mapping is enabled.
-     * Default is true.
-     * 
-     * @model default="true"
-     */
-    boolean isLoadDefaultExcludesNamepsaceMapping();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables the use of the default excludes namespace mapping.
-     * Default is true.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Load Default Excludes Namepsace Mapping</em>' attribute.
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     */
-    void setLoadDefaultExcludesNamepsaceMapping(boolean value);
-
-    /**
-     * Returns whether to validate the WSDL before generating the code.
-     * 
-     * @model default="true"
-     */
-    boolean isValidate();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isValidate <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Enables WSDL validation before code generation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Validate</em>' attribute.
-     * @see #isValidate()
-     * @generated
-     */
-    void setValidate(boolean value);
-
-    /**
-     * Returns the wsdl version .Default is WSDL1.1. Currently supports only WSDL1.1 version.
-     * 
-     * @model default="1.1"
-     */
-    String getWsdlVersion();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getWsdlVersion <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Wsdl Version</em>' attribute.
-     * @see #getWsdlVersion()
-     * @generated
-     */
-    void setWsdlVersion(String value);
-
-    /**
-     * Returns whether the tool is set to generate default vales for the
-     * generated client and the generated implementation.
-     *
-     * @model default="true"
-     */
-    boolean isUseDefaultValues();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isUseDefaultValues <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Generate default vales for the generated client and the generated implementation.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use Default Values</em>' attribute.
-     * @see #isUseDefaultValues()
-     * @generated
-     */
-    void setUseDefaultValues(boolean value);
-
-    /**
-     * Returns the comma separated list of arguments to be passed directly to
-     * the XJC when the JAXB binding is being used.
-     * 
-     * @model
-     */
-    String getXjcArgs();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcArgs <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Args</em>' attribute.
-     * @see #getXjcArgs()
-     * @generated
-     */
-    void setXjcArgs(String value);
-
-    /**
-     * Returns whether the tool is set to use the CXF proprietary WS-Addressing 
-     * type instead of the JAX-WS 2.1 compliant mapping.
-     * 
-     * @model
-     */
-    boolean isNoAddressBinding();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isNoAddressBinding <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Instructs the tool to use the CXF proprietary WS-Addressing type 
-     * instead of the JAX-WS 2.1 compliant mapping.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>No Address Binding</em>' attribute.
-     * @see #isNoAddressBinding()
-     * @generated
-     */
-    void setNoAddressBinding(boolean value);
-
-    /**
-     * Returns whether XJC will initialize fields mapped from elements with their default values.
-     * 
-     * @model
-     */
-    boolean isXjcUseDefaultValues();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Use Default Values</em>' attribute.
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     */
-    void setXjcUseDefaultValues(boolean value);
-
-    /**
-     * Returns whether XJC will generate a <code>toString()</code> method.
-     * 
-     * @model
-     */
-    boolean isXjcToString();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToString <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String</em>' attribute.
-     * @see #isXjcToString()
-     * @generated
-     */
-    void setXjcToString(boolean value);
-
-    /**
-     * Returns whether multi line output is enabled for <code>toString()</code>.
-     * 
-     * @model
-     */
-    boolean isXjcToStringMultiLine();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String Multi Line</em>' attribute.
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     */
-    void setXjcToStringMultiLine(boolean value);
-
-    /**
-     * Returns whether terse output is enabled for <code>toString()</code>.
-     * 
-     * @model
-     */
-    boolean isXjcToStringSimple();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcToStringSimple <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc To String Simple</em>' attribute.
-     * @see #isXjcToStringSimple()
-     * @generated
-     */
-    void setXjcToStringSimple(boolean value);
-
-    /**
-     * Returns whether source location support is enabled.
-     * @model
-     */
-    boolean isXjcLocator();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcLocator <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Locator</em>' attribute.
-     * @see #isXjcLocator()
-     * @generated
-     */
-    void setXjcLocator(boolean value);
-
-    /**
-     * Returns whether the XJC will generate accessor methods with 'synchronized' keyword.
-     * 
-     * @model
-     */
-    boolean isXjcSyncMethods();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcSyncMethods <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Sync Methods</em>' attribute.
-     * @see #isXjcSyncMethods()
-     * @generated
-     */
-    void setXjcSyncMethods(boolean value);
-
-    /**
-     * Returns whether the XJC will mark the code as generated using the annotations.
-     * 
-     * @model
-     */
-    boolean isXjcMarkGenerated();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isXjcMarkGenerated <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Mark Generated</em>' attribute.
-     * @see #isXjcMarkGenerated()
-     * @generated
-     */
-    void setXjcMarkGenerated(boolean value);
-
-    /**
-     * The episode file location.
-     * 
-     * @model
-     */
-    String getXjcEpisodeFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#getXjcEpisodeFile <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Xjc Episode File</em>' attribute.
-     * @see #getXjcEpisodeFile()
-     * @generated
-     */
-    void setXjcEpisodeFile(String value);
-
-    /**
-     * Returns the value of the '<em><b>Auto Name Resolution</b></em>' attribute.
-     * The default value is <code>"false"</code>.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Auto Name Resolution</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Auto Name Resolution</em>' attribute.
-     * @see #setAutoNameResolution(boolean)
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#getWSDL2JavaContext_AutoNameResolution()
-     * @model default="false"
-     * @generated
-     */
-    boolean isAutoNameResolution();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext#isAutoNameResolution <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Auto Name Resolution</em>' attribute.
-     * @see #isAutoNameResolution()
-     * @generated
-     */
-    void setAutoNameResolution(boolean value);
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java
deleted file mode 100644
index 7e189c5..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaDataModel.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.model;
-
-import java.util.Map;
-import org.eclipse.emf.common.util.EList;
-
-/**
- * @model
- */
-public interface WSDL2JavaDataModel extends CXFDataModel, WSDL2JavaContext {
-    /**
-     * Returns the package names to use for the generated code.
-     * 
-     * @model
-     */
-    Map<String, String> getIncludedNamespaces();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getIncludedNamespaces <em>Included Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specifies zero, or more, package names to use for the generated code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Included Namespaces</em>' attribute.
-     * @see #getIncludedNamespaces()
-     * @generated
-     */
-    void setIncludedNamespaces(Map<String, String> value);
-
-    /**
-     * Returns a List of the JAXWS or JAXB binding files used, if any.
-     * 
-     * @model
-     */
-    EList<String> getBindingFiles();
-
-    /**
-     * Returns the java package to excluded namespace mappings.
-     * 
-     * @model
-     */
-    Map<String, String> getExcludedNamespaces();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getExcludedNamespaces <em>Excluded Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Ignore the specified WSDL schema namespace when generating code.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Excluded Namespaces</em>' attribute.
-     * @see #getExcludedNamespaces()
-     * @generated
-     */
-    void setExcludedNamespaces(Map<String, String> value);
-
-    /**
-     * Returns the catalog file used to map the imported wsdl/schema
-     * @model
-     */
-    String getCatalogFile();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getCatalogFile <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Specify catalog file to map the imported wsdl/schema.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Catalog File</em>' attribute.
-     * @see #getCatalogFile()
-     * @generated
-     */
-    void setCatalogFile(String value);
-
-    /**
-     * Returns the value of the Java Source Directory into which the files are generated.
-     * 
-     * @model
-     */
-    String getJavaSourceFolder();
-
-    /**
-     * Sets the value of the '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel#getJavaSourceFolder <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * Sets the value of the Java Source Directory into which the files are generated.
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Java Source Folder</em>' attribute.
-     * @see #getJavaSourceFolder()
-     * @generated
-     */
-    void setJavaSourceFolder(String value);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
deleted file mode 100644
index 8ca9da2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
+++ /dev/null
@@ -1,1475 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFDataModelImpl.java,v 1.3 2009/01/29 21:46:59 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeLocation <em>Cxf Runtime Location</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeEdition <em>Cxf Runtime Edition</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getCxfRuntimeVersion <em>Cxf Runtime Version</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isVerbose <em>Verbose</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateAntBuildFile <em>Generate Ant Build File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateClient <em>Generate Client</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isGenerateServer <em>Generate Server</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getDatabinding <em>Databinding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFrontend <em>Frontend</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isUseSpringApplicationContext <em>Use Spring Application Context</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#isExportCXFClasspathContainer <em>Export CXF Classpath Container</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getProjectName <em>Project Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getResourceDirectory <em>Resource Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getClassDirectory <em>Class Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlFileName <em>Wsdl File Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlURL <em>Wsdl URL</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigWsdlLocation <em>Config Wsdl Location</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaClassName <em>Fully Qualified Java Class Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getFullyQualifiedJavaInterfaceName <em>Fully Qualified Java Interface Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getConfigId <em>Config Id</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getTargetNamespace <em>Target Namespace</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getEndpointName <em>Endpoint Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getServiceName <em>Service Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlDefinition <em>Wsdl Definition</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.CXFDataModelImpl#getWsdlLocation <em>Wsdl Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class CXFDataModelImpl extends EObjectImpl implements CXFDataModel {
-    /**
-     * The default value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeLocation() <em>Cxf Runtime Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeLocation()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeLocation = CXF_RUNTIME_LOCATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_EDITION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeEdition() <em>Cxf Runtime Edition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeEdition()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeEdition = CXF_RUNTIME_EDITION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final String CXF_RUNTIME_VERSION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCxfRuntimeVersion() <em>Cxf Runtime Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCxfRuntimeVersion()
-     * @generated
-     * @ordered
-     */
-    protected String cxfRuntimeVersion = CXF_RUNTIME_VERSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isVerbose()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean VERBOSE_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isVerbose()
-     * @generated
-     * @ordered
-     */
-    protected boolean verbose = VERBOSE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_ANT_BUILD_FILE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateAntBuildFile() <em>Generate Ant Build File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateAntBuildFile()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateAntBuildFile = GENERATE_ANT_BUILD_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateClient()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_CLIENT_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateClient() <em>Generate Client</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateClient()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateClient = GENERATE_CLIENT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateServer()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_SERVER_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isGenerateServer() <em>Generate Server</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateServer()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateServer = GENERATE_SERVER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDatabinding()
-     * @generated
-     * @ordered
-     */
-    protected static final DataBinding DATABINDING_EDEFAULT = DataBinding.JAXB;
-
-    /**
-     * The cached value of the '{@link #getDatabinding() <em>Databinding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDatabinding()
-     * @generated
-     * @ordered
-     */
-    protected DataBinding databinding = DATABINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFrontend()
-     * @generated
-     * @ordered
-     */
-    protected static final Frontend FRONTEND_EDEFAULT = Frontend.JAXWS;
-
-    /**
-     * The cached value of the '{@link #getFrontend() <em>Frontend</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFrontend()
-     * @generated
-     * @ordered
-     */
-    protected Frontend frontend = FRONTEND_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_SPRING_APPLICATION_CONTEXT_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isUseSpringApplicationContext() <em>Use Spring Application Context</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseSpringApplicationContext()
-     * @generated
-     * @ordered
-     */
-    protected boolean useSpringApplicationContext = USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isExportCXFClasspathContainer() <em>Export CXF Classpath Container</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExportCXFClasspathContainer()
-     * @generated
-     * @ordered
-     */
-    protected boolean exportCXFClasspathContainer = EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProjectName()
-     * @generated
-     * @ordered
-     */
-    protected static final String PROJECT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProjectName()
-     * @generated
-     * @ordered
-     */
-    protected String projectName = PROJECT_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getResourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String RESOURCE_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getResourceDirectory() <em>Resource Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getResourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String resourceDirectory = RESOURCE_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClassDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String CLASS_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getClassDirectory() <em>Class Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClassDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String classDirectory = CLASS_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlFileName()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_FILE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlFileName() <em>Wsdl File Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlFileName()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlFileName = WSDL_FILE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlURL()
-     * @generated
-     * @ordered
-     */
-    protected static final URL WSDL_URL_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlURL() <em>Wsdl URL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlURL()
-     * @generated
-     * @ordered
-     */
-    protected URL wsdlURL = WSDL_URL_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String CONFIG_WSDL_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getConfigWsdlLocation() <em>Config Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected String configWsdlLocation = CONFIG_WSDL_LOCATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     * @ordered
-     */
-    protected static final String FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getFullyQualifiedJavaClassName() <em>Fully Qualified Java Class Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaClassName()
-     * @generated
-     * @ordered
-     */
-    protected String fullyQualifiedJavaClassName = FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getFullyQualifiedJavaInterfaceName() <em>Fully Qualified Java Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFullyQualifiedJavaInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected String fullyQualifiedJavaInterfaceName = FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigId()
-     * @generated
-     * @ordered
-     */
-    protected static final String CONFIG_ID_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getConfigId() <em>Config Id</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getConfigId()
-     * @generated
-     * @ordered
-     */
-    protected String configId = CONFIG_ID_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTargetNamespace()
-     * @generated
-     * @ordered
-     */
-    protected static final String TARGET_NAMESPACE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getTargetNamespace() <em>Target Namespace</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTargetNamespace()
-     * @generated
-     * @ordered
-     */
-    protected String targetNamespace = TARGET_NAMESPACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEndpointName()
-     * @generated
-     * @ordered
-     */
-    protected static final String ENDPOINT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getEndpointName() <em>Endpoint Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEndpointName()
-     * @generated
-     * @ordered
-     */
-    protected String endpointName = ENDPOINT_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String SERVICE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getServiceName() <em>Service Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceName()
-     * @generated
-     * @ordered
-     */
-    protected String serviceName = SERVICE_NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlDefinition()
-     * @generated
-     * @ordered
-     */
-    protected static final Definition WSDL_DEFINITION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlDefinition() <em>Wsdl Definition</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlDefinition()
-     * @generated
-     * @ordered
-     */
-    protected Definition wsdlDefinition = WSDL_DEFINITION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_LOCATION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getWsdlLocation() <em>Wsdl Location</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlLocation()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlLocation = WSDL_LOCATION_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected CXFDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.CXF_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeLocation() {
-        return cxfRuntimeLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeLocation(String newCxfRuntimeLocation) {
-        String oldCxfRuntimeLocation = cxfRuntimeLocation;
-        cxfRuntimeLocation = newCxfRuntimeLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION, oldCxfRuntimeLocation, cxfRuntimeLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeEdition() {
-        return cxfRuntimeEdition;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeEdition(String newCxfRuntimeEdition) {
-        String oldCxfRuntimeEdition = cxfRuntimeEdition;
-        cxfRuntimeEdition = newCxfRuntimeEdition;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION, oldCxfRuntimeEdition, cxfRuntimeEdition));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCxfRuntimeVersion() {
-        return cxfRuntimeVersion;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCxfRuntimeVersion(String newCxfRuntimeVersion) {
-        String oldCxfRuntimeVersion = cxfRuntimeVersion;
-        cxfRuntimeVersion = newCxfRuntimeVersion;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION, oldCxfRuntimeVersion, cxfRuntimeVersion));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isVerbose() {
-        return verbose;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setVerbose(boolean newVerbose) {
-        boolean oldVerbose = verbose;
-        verbose = newVerbose;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__VERBOSE, oldVerbose, verbose));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateAntBuildFile() {
-        return generateAntBuildFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateAntBuildFile(boolean newGenerateAntBuildFile) {
-        boolean oldGenerateAntBuildFile = generateAntBuildFile;
-        generateAntBuildFile = newGenerateAntBuildFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE, oldGenerateAntBuildFile, generateAntBuildFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateClient() {
-        return generateClient;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateClient(boolean newGenerateClient) {
-        boolean oldGenerateClient = generateClient;
-        generateClient = newGenerateClient;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT, oldGenerateClient, generateClient));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateServer() {
-        return generateServer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateServer(boolean newGenerateServer) {
-        boolean oldGenerateServer = generateServer;
-        generateServer = newGenerateServer;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER, oldGenerateServer, generateServer));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public DataBinding getDatabinding() {
-        return databinding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setDatabinding(DataBinding newDatabinding) {
-        DataBinding oldDatabinding = databinding;
-        databinding = newDatabinding == null ? DATABINDING_EDEFAULT : newDatabinding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__DATABINDING, oldDatabinding, databinding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Frontend getFrontend() {
-        return frontend;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFrontend(Frontend newFrontend) {
-        Frontend oldFrontend = frontend;
-        frontend = newFrontend == null ? FRONTEND_EDEFAULT : newFrontend;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FRONTEND, oldFrontend, frontend));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseSpringApplicationContext() {
-        return useSpringApplicationContext;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseSpringApplicationContext(boolean newUseSpringApplicationContext) {
-        boolean oldUseSpringApplicationContext = useSpringApplicationContext;
-        useSpringApplicationContext = newUseSpringApplicationContext;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT, oldUseSpringApplicationContext, useSpringApplicationContext));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isExportCXFClasspathContainer() {
-        return exportCXFClasspathContainer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExportCXFClasspathContainer(boolean newExportCXFClasspathContainer) {
-        boolean oldExportCXFClasspathContainer = exportCXFClasspathContainer;
-        exportCXFClasspathContainer = newExportCXFClasspathContainer;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER, oldExportCXFClasspathContainer, exportCXFClasspathContainer));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getProjectName() {
-        return projectName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setProjectName(String newProjectName) {
-        String oldProjectName = projectName;
-        projectName = newProjectName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__PROJECT_NAME, oldProjectName, projectName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getResourceDirectory() {
-        return resourceDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setResourceDirectory(String newResourceDirectory) {
-        String oldResourceDirectory = resourceDirectory;
-        resourceDirectory = newResourceDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY, oldResourceDirectory, resourceDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getClassDirectory() {
-        return classDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setClassDirectory(String newClassDirectory) {
-        String oldClassDirectory = classDirectory;
-        classDirectory = newClassDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY, oldClassDirectory, classDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlFileName() {
-        return wsdlFileName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlFileName(String newWsdlFileName) {
-        String oldWsdlFileName = wsdlFileName;
-        wsdlFileName = newWsdlFileName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME, oldWsdlFileName, wsdlFileName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public URL getWsdlURL() {
-        return wsdlURL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlURL(URL newWsdlURL) {
-        URL oldWsdlURL = wsdlURL;
-        wsdlURL = newWsdlURL;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_URL, oldWsdlURL, wsdlURL));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getConfigWsdlLocation() {
-        return configWsdlLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setConfigWsdlLocation(String newConfigWsdlLocation) {
-        String oldConfigWsdlLocation = configWsdlLocation;
-        configWsdlLocation = newConfigWsdlLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION, oldConfigWsdlLocation, configWsdlLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getFullyQualifiedJavaClassName() {
-        return fullyQualifiedJavaClassName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFullyQualifiedJavaClassName(String newFullyQualifiedJavaClassName) {
-        String oldFullyQualifiedJavaClassName = fullyQualifiedJavaClassName;
-        fullyQualifiedJavaClassName = newFullyQualifiedJavaClassName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME, oldFullyQualifiedJavaClassName, fullyQualifiedJavaClassName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getFullyQualifiedJavaInterfaceName() {
-        return fullyQualifiedJavaInterfaceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setFullyQualifiedJavaInterfaceName(String newFullyQualifiedJavaInterfaceName) {
-        String oldFullyQualifiedJavaInterfaceName = fullyQualifiedJavaInterfaceName;
-        fullyQualifiedJavaInterfaceName = newFullyQualifiedJavaInterfaceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME, oldFullyQualifiedJavaInterfaceName, fullyQualifiedJavaInterfaceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getConfigId() {
-        return configId;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setConfigId(String newConfigId) {
-        String oldConfigId = configId;
-        configId = newConfigId;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__CONFIG_ID, oldConfigId, configId));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getTargetNamespace() {
-        return targetNamespace;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setTargetNamespace(String newTargetNamespace) {
-        String oldTargetNamespace = targetNamespace;
-        targetNamespace = newTargetNamespace;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE, oldTargetNamespace, targetNamespace));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getEndpointName() {
-        return endpointName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setEndpointName(String newEndpointName) {
-        String oldEndpointName = endpointName;
-        endpointName = newEndpointName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME, oldEndpointName, endpointName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setServiceName(String newServiceName) {
-        String oldServiceName = serviceName;
-        serviceName = newServiceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__SERVICE_NAME, oldServiceName, serviceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Definition getWsdlDefinition() {
-        return wsdlDefinition;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlDefinition(Definition newWsdlDefinition) {
-        Definition oldWsdlDefinition = wsdlDefinition;
-        wsdlDefinition = newWsdlDefinition;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION, oldWsdlDefinition, wsdlDefinition));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlLocation() {
-        return wsdlLocation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlLocation(String newWsdlLocation) {
-        String oldWsdlLocation = wsdlLocation;
-        wsdlLocation = newWsdlLocation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION, oldWsdlLocation, wsdlLocation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                return getCxfRuntimeLocation();
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                return getCxfRuntimeEdition();
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                return getCxfRuntimeVersion();
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                return isVerbose() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                return isGenerateAntBuildFile() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                return isGenerateClient() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                return isGenerateServer() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                return getDatabinding();
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                return getFrontend();
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                return isUseSpringApplicationContext() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                return isExportCXFClasspathContainer() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                return getProjectName();
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                return getResourceDirectory();
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                return getClassDirectory();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                return getWsdlFileName();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                return getWsdlURL();
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                return getConfigWsdlLocation();
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                return getFullyQualifiedJavaClassName();
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                return getFullyQualifiedJavaInterfaceName();
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                return getConfigId();
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                return getTargetNamespace();
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                return getEndpointName();
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                return getServiceName();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                return getWsdlDefinition();
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                return getWsdlLocation();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                setCxfRuntimeLocation((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                setCxfRuntimeEdition((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                setCxfRuntimeVersion((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                setVerbose(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                setGenerateAntBuildFile(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                setGenerateClient(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                setGenerateServer(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                setDatabinding((DataBinding)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                setFrontend((Frontend)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                setUseSpringApplicationContext(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                setExportCXFClasspathContainer(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                setProjectName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                setResourceDirectory((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                setClassDirectory((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                setWsdlFileName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                setWsdlURL((URL)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                setConfigWsdlLocation((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                setFullyQualifiedJavaClassName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                setFullyQualifiedJavaInterfaceName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                setConfigId((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                setTargetNamespace((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                setEndpointName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                setServiceName((String)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                setWsdlDefinition((Definition)newValue);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                setWsdlLocation((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                setCxfRuntimeLocation(CXF_RUNTIME_LOCATION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                setCxfRuntimeEdition(CXF_RUNTIME_EDITION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                setCxfRuntimeVersion(CXF_RUNTIME_VERSION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                setVerbose(VERBOSE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                setGenerateAntBuildFile(GENERATE_ANT_BUILD_FILE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                setGenerateClient(GENERATE_CLIENT_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                setGenerateServer(GENERATE_SERVER_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                setDatabinding(DATABINDING_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                setFrontend(FRONTEND_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                setUseSpringApplicationContext(USE_SPRING_APPLICATION_CONTEXT_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                setExportCXFClasspathContainer(EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                setProjectName(PROJECT_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                setResourceDirectory(RESOURCE_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                setClassDirectory(CLASS_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                setWsdlFileName(WSDL_FILE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                setWsdlURL(WSDL_URL_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                setConfigWsdlLocation(CONFIG_WSDL_LOCATION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                setFullyQualifiedJavaClassName(FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                setFullyQualifiedJavaInterfaceName(FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                setConfigId(CONFIG_ID_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                setTargetNamespace(TARGET_NAMESPACE_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                setEndpointName(ENDPOINT_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                setServiceName(SERVICE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                setWsdlDefinition(WSDL_DEFINITION_EDEFAULT);
-                return;
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                setWsdlLocation(WSDL_LOCATION_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_LOCATION:
-                return CXF_RUNTIME_LOCATION_EDEFAULT == null ? cxfRuntimeLocation != null : !CXF_RUNTIME_LOCATION_EDEFAULT.equals(cxfRuntimeLocation);
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_EDITION:
-                return CXF_RUNTIME_EDITION_EDEFAULT == null ? cxfRuntimeEdition != null : !CXF_RUNTIME_EDITION_EDEFAULT.equals(cxfRuntimeEdition);
-            case CXFPackage.CXF_DATA_MODEL__CXF_RUNTIME_VERSION:
-                return CXF_RUNTIME_VERSION_EDEFAULT == null ? cxfRuntimeVersion != null : !CXF_RUNTIME_VERSION_EDEFAULT.equals(cxfRuntimeVersion);
-            case CXFPackage.CXF_DATA_MODEL__VERBOSE:
-                return verbose != VERBOSE_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_ANT_BUILD_FILE:
-                return generateAntBuildFile != GENERATE_ANT_BUILD_FILE_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_CLIENT:
-                return generateClient != GENERATE_CLIENT_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__GENERATE_SERVER:
-                return generateServer != GENERATE_SERVER_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__DATABINDING:
-                return databinding != DATABINDING_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__FRONTEND:
-                return frontend != FRONTEND_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__USE_SPRING_APPLICATION_CONTEXT:
-                return useSpringApplicationContext != USE_SPRING_APPLICATION_CONTEXT_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__EXPORT_CXF_CLASSPATH_CONTAINER:
-                return exportCXFClasspathContainer != EXPORT_CXF_CLASSPATH_CONTAINER_EDEFAULT;
-            case CXFPackage.CXF_DATA_MODEL__PROJECT_NAME:
-                return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
-            case CXFPackage.CXF_DATA_MODEL__RESOURCE_DIRECTORY:
-                return RESOURCE_DIRECTORY_EDEFAULT == null ? resourceDirectory != null : !RESOURCE_DIRECTORY_EDEFAULT.equals(resourceDirectory);
-            case CXFPackage.CXF_DATA_MODEL__CLASS_DIRECTORY:
-                return CLASS_DIRECTORY_EDEFAULT == null ? classDirectory != null : !CLASS_DIRECTORY_EDEFAULT.equals(classDirectory);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_FILE_NAME:
-                return WSDL_FILE_NAME_EDEFAULT == null ? wsdlFileName != null : !WSDL_FILE_NAME_EDEFAULT.equals(wsdlFileName);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_URL:
-                return WSDL_URL_EDEFAULT == null ? wsdlURL != null : !WSDL_URL_EDEFAULT.equals(wsdlURL);
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_WSDL_LOCATION:
-                return CONFIG_WSDL_LOCATION_EDEFAULT == null ? configWsdlLocation != null : !CONFIG_WSDL_LOCATION_EDEFAULT.equals(configWsdlLocation);
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME:
-                return FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT == null ? fullyQualifiedJavaClassName != null : !FULLY_QUALIFIED_JAVA_CLASS_NAME_EDEFAULT.equals(fullyQualifiedJavaClassName);
-            case CXFPackage.CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME:
-                return FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT == null ? fullyQualifiedJavaInterfaceName != null : !FULLY_QUALIFIED_JAVA_INTERFACE_NAME_EDEFAULT.equals(fullyQualifiedJavaInterfaceName);
-            case CXFPackage.CXF_DATA_MODEL__CONFIG_ID:
-                return CONFIG_ID_EDEFAULT == null ? configId != null : !CONFIG_ID_EDEFAULT.equals(configId);
-            case CXFPackage.CXF_DATA_MODEL__TARGET_NAMESPACE:
-                return TARGET_NAMESPACE_EDEFAULT == null ? targetNamespace != null : !TARGET_NAMESPACE_EDEFAULT.equals(targetNamespace);
-            case CXFPackage.CXF_DATA_MODEL__ENDPOINT_NAME:
-                return ENDPOINT_NAME_EDEFAULT == null ? endpointName != null : !ENDPOINT_NAME_EDEFAULT.equals(endpointName);
-            case CXFPackage.CXF_DATA_MODEL__SERVICE_NAME:
-                return SERVICE_NAME_EDEFAULT == null ? serviceName != null : !SERVICE_NAME_EDEFAULT.equals(serviceName);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_DEFINITION:
-                return WSDL_DEFINITION_EDEFAULT == null ? wsdlDefinition != null : !WSDL_DEFINITION_EDEFAULT.equals(wsdlDefinition);
-            case CXFPackage.CXF_DATA_MODEL__WSDL_LOCATION:
-                return WSDL_LOCATION_EDEFAULT == null ? wsdlLocation != null : !WSDL_LOCATION_EDEFAULT.equals(wsdlLocation);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (cxfRuntimeLocation: ");
-        result.append(cxfRuntimeLocation);
-        result.append(", cxfRuntimeEdition: ");
-        result.append(cxfRuntimeEdition);
-        result.append(", cxfRuntimeVersion: ");
-        result.append(cxfRuntimeVersion);
-        result.append(", verbose: ");
-        result.append(verbose);
-        result.append(", generateAntBuildFile: ");
-        result.append(generateAntBuildFile);
-        result.append(", generateClient: ");
-        result.append(generateClient);
-        result.append(", generateServer: ");
-        result.append(generateServer);
-        result.append(", databinding: ");
-        result.append(databinding);
-        result.append(", frontend: ");
-        result.append(frontend);
-        result.append(", useSpringApplicationContext: ");
-        result.append(useSpringApplicationContext);
-        result.append(", exportCXFClasspathContainer: ");
-        result.append(exportCXFClasspathContainer);
-        result.append(", projectName: ");
-        result.append(projectName);
-        result.append(", resourceDirectory: ");
-        result.append(resourceDirectory);
-        result.append(", classDirectory: ");
-        result.append(classDirectory);
-        result.append(", wsdlFileName: ");
-        result.append(wsdlFileName);
-        result.append(", wsdlURL: ");
-        result.append(wsdlURL);
-        result.append(", configWsdlLocation: ");
-        result.append(configWsdlLocation);
-        result.append(", fullyQualifiedJavaClassName: ");
-        result.append(fullyQualifiedJavaClassName);
-        result.append(", fullyQualifiedJavaInterfaceName: ");
-        result.append(fullyQualifiedJavaInterfaceName);
-        result.append(", configId: ");
-        result.append(configId);
-        result.append(", targetNamespace: ");
-        result.append(targetNamespace);
-        result.append(", endpointName: ");
-        result.append(endpointName);
-        result.append(", serviceName: ");
-        result.append(serviceName);
-        result.append(", wsdlDefinition: ");
-        result.append(wsdlDefinition);
-        result.append(", wsdlLocation: ");
-        result.append(wsdlLocation);
-        result.append(')');
-        return result.toString();
-    }
-
-} //CXFDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
deleted file mode 100644
index 7c51630..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFFactoryImpl.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFFactoryImpl.java,v 1.1 2008/11/10 20:37:42 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.net.URL;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFFactoryImpl extends EFactoryImpl implements CXFFactory {
-    /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static CXFFactory init() {
-        try {
-            CXFFactory theCXFFactory = (CXFFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/ws/internal/cxf/core/model.ecore"); 
-            if (theCXFFactory != null) {
-                return theCXFFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new CXFFactoryImpl();
-    }
-
-    /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFFactoryImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public EObject create(EClass eClass) {
-        switch (eClass.getClassifierID()) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL: return (EObject)createJava2WSDataModel();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL: return (EObject)createWSDL2JavaDataModel();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object createFromString(EDataType eDataType, String initialValue) {
-        switch (eDataType.getClassifierID()) {
-            case CXFPackage.FRONTEND:
-                return createFrontendFromString(eDataType, initialValue);
-            case CXFPackage.DATA_BINDING:
-                return createDataBindingFromString(eDataType, initialValue);
-            case CXFPackage.URL:
-                return createURLFromString(eDataType, initialValue);
-            case CXFPackage.DEFINITION:
-                return createDefinitionFromString(eDataType, initialValue);
-            case CXFPackage.MAP:
-                return createMapFromString(eDataType, initialValue);
-            case CXFPackage.IMETHOD:
-                return createIMethodFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String convertToString(EDataType eDataType, Object instanceValue) {
-        switch (eDataType.getClassifierID()) {
-            case CXFPackage.FRONTEND:
-                return convertFrontendToString(eDataType, instanceValue);
-            case CXFPackage.DATA_BINDING:
-                return convertDataBindingToString(eDataType, instanceValue);
-            case CXFPackage.URL:
-                return convertURLToString(eDataType, instanceValue);
-            case CXFPackage.DEFINITION:
-                return convertDefinitionToString(eDataType, instanceValue);
-            case CXFPackage.MAP:
-                return convertMapToString(eDataType, instanceValue);
-            case CXFPackage.IMETHOD:
-                return convertIMethodToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Java2WSDataModel createJava2WSDataModel() {
-        Java2WSDataModelImpl java2WSDataModel = new Java2WSDataModelImpl();
-        return java2WSDataModel;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDL2JavaDataModel createWSDL2JavaDataModel() {
-        WSDL2JavaDataModelImpl wsdl2JavaDataModel = new WSDL2JavaDataModelImpl();
-        return wsdl2JavaDataModel;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Frontend createFrontendFromString(EDataType eDataType, String initialValue) {
-        Frontend result = Frontend.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertFrontendToString(EDataType eDataType, Object instanceValue) {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public DataBinding createDataBindingFromString(EDataType eDataType, String initialValue) {
-        DataBinding result = DataBinding.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertDataBindingToString(EDataType eDataType, Object instanceValue) {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public URL createURLFromString(EDataType eDataType, String initialValue) {
-        return (URL)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertURLToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Definition createDefinitionFromString(EDataType eDataType, String initialValue) {
-        return (Definition)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertDefinitionToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<?, ?> createMapFromString(EDataType eDataType, String initialValue) {
-        return (Map<?, ?>)super.createFromString(initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertMapToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public IMethod createIMethodFromString(EDataType eDataType, String initialValue) {
-        return (IMethod)super.createFromString(eDataType, initialValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertIMethodToString(EDataType eDataType, Object instanceValue) {
-        return super.convertToString(eDataType, instanceValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFPackage getCXFPackage() {
-        return (CXFPackage)getEPackage();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
-    @Deprecated
-    public static CXFPackage getPackage() {
-        return CXFPackage.eINSTANCE;
-    }
-
-} //CXFFactoryImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
deleted file mode 100644
index 07deebe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
+++ /dev/null
@@ -1,1177 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFPackageImpl.java,v 1.4 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EGenericType;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CXFPackageImpl extends EPackageImpl implements CXFPackage {
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass cxfContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass cxfDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass java2WSContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass java2WSDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdl2JavaContextEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass wsdl2JavaDataModelEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EEnum frontendEEnum = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EEnum dataBindingEEnum = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType urlEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType definitionEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType mapEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType iMethodEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private CXFPackageImpl() {
-        super(eNS_URI, CXFFactory.eINSTANCE);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this
-     * model, and for any others upon which it depends.  Simple
-     * dependencies are satisfied by calling this method on all
-     * dependent packages before doing anything else.  This method drives
-     * initialization for interdependent packages directly, in parallel
-     * with this package, itself.
-     * <p>Of this package and its interdependencies, all packages which
-     * have not yet been registered by their URI values are first created
-     * and registered.  The packages are then initialized in two steps:
-     * meta-model objects for all of the packages are created before any
-     * are initialized, since one package's meta-model objects may refer to
-     * those of another.
-     * <p>Invocation of this method will not affect any packages that have
-     * already been initialized.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static CXFPackage init() {
-        if (isInited) return (CXFPackage)EPackage.Registry.INSTANCE.getEPackage(CXFPackage.eNS_URI);
-
-        // Obtain or create and register package
-        CXFPackageImpl theCXFPackage = (CXFPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CXFPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CXFPackageImpl());
-
-        isInited = true;
-
-        // Create package meta-data objects
-        theCXFPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theCXFPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theCXFPackage.freeze();
-
-        return theCXFPackage;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getCXFContext() {
-        return cxfContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeLocation() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeEdition() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_CxfRuntimeVersion() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Verbose() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateAntBuildFile() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateClient() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_GenerateServer() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Databinding() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_Frontend() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_UseSpringApplicationContext() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFContext_ExportCXFClasspathContainer() {
-        return (EAttribute)cxfContextEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getCXFDataModel() {
-        return cxfDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ProjectName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ResourceDirectory() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ClassDirectory() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlFileName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlURL() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ConfigWsdlLocation() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_FullyQualifiedJavaClassName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_FullyQualifiedJavaInterfaceName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ConfigId() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_TargetNamespace() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_EndpointName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_ServiceName() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(11);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlDefinition() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(12);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getCXFDataModel_WsdlLocation() {
-        return (EAttribute)cxfDataModelEClass.getEStructuralFeatures().get(13);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getJava2WSContext() {
-        return java2WSContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_Soap12Binding() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateXSDImports() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWSDL() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWrapperFaultBeans() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_AnnotationProcessingEnabled() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWebMethodAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateWebParamAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateRequestWrapperAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSContext_GenerateResponseWrapperAnnotation() {
-        return (EAttribute)java2WSContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getJava2WSDataModel() {
-        return java2WSDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_Classpath() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_JavaStartingPoint() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_UseServiceEndpointInterface() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_ExtractInterface() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_ServiceEndpointInterfaceName() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_MethodMap() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_AnnotationMap() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_SourceDirectory() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getJava2WSDataModel_PortName() {
-        return (EAttribute)java2WSDataModelEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDL2JavaContext() {
-        return wsdl2JavaContextEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_GenerateImplementation() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_ProcessSOAPHeaders() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_Validate() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_WsdlVersion() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_UseDefaultValues() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcArgs() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_NoAddressBinding() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcUseDefaultValues() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToString() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToStringMultiLine() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(11);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcToStringSimple() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(12);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcLocator() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(13);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcSyncMethods() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(14);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcMarkGenerated() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(15);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_XjcEpisodeFile() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(16);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaContext_AutoNameResolution() {
-        return (EAttribute)wsdl2JavaContextEClass.getEStructuralFeatures().get(17);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EClass getWSDL2JavaDataModel() {
-        return wsdl2JavaDataModelEClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_IncludedNamespaces() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_BindingFiles() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_ExcludedNamespaces() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_CatalogFile() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EAttribute getWSDL2JavaDataModel_JavaSourceFolder() {
-        return (EAttribute)wsdl2JavaDataModelEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EEnum getFrontend() {
-        return frontendEEnum;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EEnum getDataBinding() {
-        return dataBindingEEnum;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getURL() {
-        return urlEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getDefinition() {
-        return definitionEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getMap() {
-        return mapEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EDataType getIMethod() {
-        return iMethodEDataType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFFactory getCXFFactory() {
-        return (CXFFactory)getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents() {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create classes and their features
-        cxfContextEClass = createEClass(CXF_CONTEXT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_LOCATION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_EDITION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__CXF_RUNTIME_VERSION);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__VERBOSE);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_ANT_BUILD_FILE);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_CLIENT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__GENERATE_SERVER);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__DATABINDING);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__FRONTEND);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
-        createEAttribute(cxfContextEClass, CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER);
-
-        cxfDataModelEClass = createEClass(CXF_DATA_MODEL);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__PROJECT_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__RESOURCE_DIRECTORY);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CLASS_DIRECTORY);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_FILE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_URL);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_WSDL_LOCATION);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_CLASS_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__FULLY_QUALIFIED_JAVA_INTERFACE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__CONFIG_ID);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__TARGET_NAMESPACE);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__ENDPOINT_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__SERVICE_NAME);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_DEFINITION);
-        createEAttribute(cxfDataModelEClass, CXF_DATA_MODEL__WSDL_LOCATION);
-
-        java2WSContextEClass = createEClass(JAVA2_WS_CONTEXT);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__SOAP12_BINDING);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WSDL);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION);
-        createEAttribute(java2WSContextEClass, JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION);
-
-        java2WSDataModelEClass = createEClass(JAVA2_WS_DATA_MODEL);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__CLASSPATH);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__METHOD_MAP);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__ANNOTATION_MAP);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY);
-        createEAttribute(java2WSDataModelEClass, JAVA2_WS_DATA_MODEL__PORT_NAME);
-
-        wsdl2JavaContextEClass = createEClass(WSDL2_JAVA_CONTEXT);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__VALIDATE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__WSDL_VERSION);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_ARGS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_LOCATOR);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE);
-        createEAttribute(wsdl2JavaContextEClass, WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION);
-
-        wsdl2JavaDataModelEClass = createEClass(WSDL2_JAVA_DATA_MODEL);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__CATALOG_FILE);
-        createEAttribute(wsdl2JavaDataModelEClass, WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER);
-
-        // Create enums
-        frontendEEnum = createEEnum(FRONTEND);
-        dataBindingEEnum = createEEnum(DATA_BINDING);
-
-        // Create data types
-        urlEDataType = createEDataType(URL);
-        definitionEDataType = createEDataType(DEFINITION);
-        mapEDataType = createEDataType(MAP);
-        iMethodEDataType = createEDataType(IMETHOD);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents() {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Create type parameters
-        addETypeParameter(mapEDataType, "T");
-        addETypeParameter(mapEDataType, "T1");
-
-        // Set bounds for type parameters
-
-        // Add supertypes to classes
-        cxfDataModelEClass.getESuperTypes().add(this.getCXFContext());
-        java2WSContextEClass.getESuperTypes().add(this.getCXFContext());
-        java2WSDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
-        java2WSDataModelEClass.getESuperTypes().add(this.getJava2WSContext());
-        wsdl2JavaContextEClass.getESuperTypes().add(this.getCXFContext());
-        wsdl2JavaDataModelEClass.getESuperTypes().add(this.getCXFDataModel());
-        wsdl2JavaDataModelEClass.getESuperTypes().add(this.getWSDL2JavaContext());
-
-        // Initialize classes and features; add operations and parameters
-        initEClass(cxfContextEClass, CXFContext.class, "CXFContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCXFContext_CxfRuntimeLocation(), ecorePackage.getEString(), "cxfRuntimeLocation", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_CxfRuntimeEdition(), ecorePackage.getEString(), "cxfRuntimeEdition", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_CxfRuntimeVersion(), ecorePackage.getEString(), "cxfRuntimeVersion", null, 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Verbose(), ecorePackage.getEBoolean(), "verbose", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateAntBuildFile(), ecorePackage.getEBoolean(), "generateAntBuildFile", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateClient(), ecorePackage.getEBoolean(), "generateClient", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_GenerateServer(), ecorePackage.getEBoolean(), "generateServer", "false", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Databinding(), this.getDataBinding(), "databinding", "jaxb", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_Frontend(), this.getFrontend(), "frontend", "jaxws", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_UseSpringApplicationContext(), ecorePackage.getEBoolean(), "useSpringApplicationContext", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFContext_ExportCXFClasspathContainer(), ecorePackage.getEBoolean(), "exportCXFClasspathContainer", "true", 0, 1, CXFContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(cxfDataModelEClass, CXFDataModel.class, "CXFDataModel", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getCXFDataModel_ProjectName(), ecorePackage.getEString(), "projectName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ResourceDirectory(), ecorePackage.getEString(), "resourceDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ClassDirectory(), ecorePackage.getEString(), "classDirectory", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlFileName(), ecorePackage.getEString(), "wsdlFileName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlURL(), this.getURL(), "wsdlURL", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ConfigWsdlLocation(), ecorePackage.getEString(), "configWsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_FullyQualifiedJavaClassName(), ecorePackage.getEString(), "fullyQualifiedJavaClassName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_FullyQualifiedJavaInterfaceName(), ecorePackage.getEString(), "fullyQualifiedJavaInterfaceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ConfigId(), ecorePackage.getEString(), "configId", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_TargetNamespace(), ecorePackage.getEString(), "targetNamespace", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_EndpointName(), ecorePackage.getEString(), "endpointName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_ServiceName(), ecorePackage.getEString(), "serviceName", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlDefinition(), this.getDefinition(), "wsdlDefinition", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getCXFDataModel_WsdlLocation(), ecorePackage.getEString(), "wsdlLocation", null, 0, 1, CXFDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(java2WSContextEClass, Java2WSContext.class, "Java2WSContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getJava2WSContext_Soap12Binding(), ecorePackage.getEBoolean(), "soap12Binding", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateXSDImports(), ecorePackage.getEBoolean(), "generateXSDImports", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWSDL(), ecorePackage.getEBoolean(), "generateWSDL", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWrapperFaultBeans(), ecorePackage.getEBoolean(), "generateWrapperFaultBeans", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_AnnotationProcessingEnabled(), ecorePackage.getEBoolean(), "annotationProcessingEnabled", "false", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWebMethodAnnotation(), ecorePackage.getEBoolean(), "generateWebMethodAnnotation", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateWebParamAnnotation(), ecorePackage.getEBoolean(), "generateWebParamAnnotation", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateRequestWrapperAnnotation(), ecorePackage.getEBoolean(), "generateRequestWrapperAnnotation", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSContext_GenerateResponseWrapperAnnotation(), ecorePackage.getEBoolean(), "generateResponseWrapperAnnotation", "true", 0, 1, Java2WSContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(java2WSDataModelEClass, Java2WSDataModel.class, "Java2WSDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getJava2WSDataModel_Classpath(), ecorePackage.getEString(), "classpath", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_JavaStartingPoint(), ecorePackage.getEString(), "javaStartingPoint", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_UseServiceEndpointInterface(), ecorePackage.getEBoolean(), "useServiceEndpointInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_ExtractInterface(), ecorePackage.getEBoolean(), "extractInterface", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_ServiceEndpointInterfaceName(), ecorePackage.getEString(), "serviceEndpointInterfaceName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        EGenericType g1 = createEGenericType(this.getMap());
-        EGenericType g2 = createEGenericType(this.getIMethod());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(this.getMap());
-        g1.getETypeArguments().add(g2);
-        EGenericType g3 = createEGenericType(ecorePackage.getEString());
-        g2.getETypeArguments().add(g3);
-        g3 = createEGenericType(ecorePackage.getEBooleanObject());
-        g2.getETypeArguments().add(g3);
-        initEAttribute(getJava2WSDataModel_MethodMap(), g1, "methodMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEBooleanObject());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getJava2WSDataModel_AnnotationMap(), g1, "annotationMap", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_SourceDirectory(), ecorePackage.getEString(), "sourceDirectory", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getJava2WSDataModel_PortName(), ecorePackage.getEString(), "portName", null, 0, 1, Java2WSDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(wsdl2JavaContextEClass, WSDL2JavaContext.class, "WSDL2JavaContext", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getWSDL2JavaContext_GenerateImplementation(), ecorePackage.getEBoolean(), "generateImplementation", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_ProcessSOAPHeaders(), ecorePackage.getEBoolean(), "processSOAPHeaders", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping(), ecorePackage.getEBoolean(), "loadDefaultNamespacePackageNameMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping(), ecorePackage.getEBoolean(), "loadDefaultExcludesNamepsaceMapping", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_Validate(), ecorePackage.getEBoolean(), "validate", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_WsdlVersion(), ecorePackage.getEString(), "wsdlVersion", "1.1", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_UseDefaultValues(), ecorePackage.getEBoolean(), "useDefaultValues", "true", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcArgs(), ecorePackage.getEString(), "xjcArgs", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_NoAddressBinding(), ecorePackage.getEBoolean(), "noAddressBinding", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcUseDefaultValues(), ecorePackage.getEBoolean(), "xjcUseDefaultValues", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToString(), ecorePackage.getEBoolean(), "xjcToString", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToStringMultiLine(), ecorePackage.getEBoolean(), "xjcToStringMultiLine", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcToStringSimple(), ecorePackage.getEBoolean(), "xjcToStringSimple", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcLocator(), ecorePackage.getEBoolean(), "xjcLocator", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcSyncMethods(), ecorePackage.getEBoolean(), "xjcSyncMethods", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcMarkGenerated(), ecorePackage.getEBoolean(), "xjcMarkGenerated", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_XjcEpisodeFile(), ecorePackage.getEString(), "xjcEpisodeFile", null, 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaContext_AutoNameResolution(), ecorePackage.getEBoolean(), "autoNameResolution", "false", 0, 1, WSDL2JavaContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(wsdl2JavaDataModelEClass, WSDL2JavaDataModel.class, "WSDL2JavaDataModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getWSDL2JavaDataModel_IncludedNamespaces(), g1, "includedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_BindingFiles(), ecorePackage.getEString(), "bindingFiles", null, 0, -1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        g1 = createEGenericType(this.getMap());
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        g2 = createEGenericType(ecorePackage.getEString());
-        g1.getETypeArguments().add(g2);
-        initEAttribute(getWSDL2JavaDataModel_ExcludedNamespaces(), g1, "excludedNamespaces", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_CatalogFile(), ecorePackage.getEString(), "catalogFile", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getWSDL2JavaDataModel_JavaSourceFolder(), ecorePackage.getEString(), "javaSourceFolder", null, 0, 1, WSDL2JavaDataModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        // Initialize enums and add enum literals
-        initEEnum(frontendEEnum, Frontend.class, "Frontend");
-        addEEnumLiteral(frontendEEnum, Frontend.JAXWS);
-
-        initEEnum(dataBindingEEnum, DataBinding.class, "DataBinding");
-        addEEnumLiteral(dataBindingEEnum, DataBinding.JAXB);
-
-        // Initialize data types
-        initEDataType(urlEDataType, java.net.URL.class, "URL", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(definitionEDataType, Definition.class, "Definition", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(mapEDataType, Map.class, "Map", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(iMethodEDataType, IMethod.class, "IMethod", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-} //CXFPackageImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
deleted file mode 100644
index c800b43..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/Java2WSDataModelImpl.java
+++ /dev/null
@@ -1,1124 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: Java2WSDataModelImpl.java,v 1.1 2008/11/10 20:37:42 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java2 WS Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isSoap12Binding <em>Soap12 Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateXSDImports <em>Generate XSD Imports</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWSDL <em>Generate WSDL</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWrapperFaultBeans <em>Generate Wrapper Fault Beans</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isAnnotationProcessingEnabled <em>Annotation Processing Enabled</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebMethodAnnotation <em>Generate Web Method Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateWebParamAnnotation <em>Generate Web Param Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateRequestWrapperAnnotation <em>Generate Request Wrapper Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isGenerateResponseWrapperAnnotation <em>Generate Response Wrapper Annotation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getClasspath <em>Classpath</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getJavaStartingPoint <em>Java Starting Point</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isUseServiceEndpointInterface <em>Use Service Endpoint Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#isExtractInterface <em>Extract Interface</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getServiceEndpointInterfaceName <em>Service Endpoint Interface Name</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getMethodMap <em>Method Map</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getAnnotationMap <em>Annotation Map</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getSourceDirectory <em>Source Directory</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.Java2WSDataModelImpl#getPortName <em>Port Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Java2WSDataModelImpl extends CXFDataModelImpl implements Java2WSDataModel {
-    /**
-     * The default value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSoap12Binding()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean SOAP12_BINDING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isSoap12Binding() <em>Soap12 Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isSoap12Binding()
-     * @generated
-     * @ordered
-     */
-    protected boolean soap12Binding = SOAP12_BINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateXSDImports()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_XSD_IMPORTS_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateXSDImports() <em>Generate XSD Imports</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateXSDImports()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateXSDImports = GENERATE_XSD_IMPORTS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWSDL()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WSDL_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWSDL() <em>Generate WSDL</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWSDL()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWSDL = GENERATE_WSDL_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWrapperFaultBeans() <em>Generate Wrapper Fault Beans</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWrapperFaultBeans()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWrapperFaultBeans = GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean ANNOTATION_PROCESSING_ENABLED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isAnnotationProcessingEnabled() <em>Annotation Processing Enabled</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAnnotationProcessingEnabled()
-     * @generated
-     * @ordered
-     */
-    protected boolean annotationProcessingEnabled = ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWebMethodAnnotation() <em>Generate Web Method Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebMethodAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWebMethodAnnotation = GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateWebParamAnnotation() <em>Generate Web Param Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateWebParamAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateWebParamAnnotation = GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateRequestWrapperAnnotation() <em>Generate Request Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateRequestWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateRequestWrapperAnnotation = GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateResponseWrapperAnnotation() <em>Generate Response Wrapper Annotation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateResponseWrapperAnnotation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateResponseWrapperAnnotation = GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClasspath()
-     * @generated
-     * @ordered
-     */
-    protected static final String CLASSPATH_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getClasspath() <em>Classpath</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClasspath()
-     * @generated
-     * @ordered
-     */
-    protected String classpath = CLASSPATH_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaStartingPoint()
-     * @generated
-     * @ordered
-     */
-    protected static final String JAVA_STARTING_POINT_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getJavaStartingPoint() <em>Java Starting Point</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaStartingPoint()
-     * @generated
-     * @ordered
-     */
-    protected String javaStartingPoint = JAVA_STARTING_POINT_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isUseServiceEndpointInterface() <em>Use Service Endpoint Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseServiceEndpointInterface()
-     * @generated
-     * @ordered
-     */
-    protected boolean useServiceEndpointInterface = USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExtractInterface()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean EXTRACT_INTERFACE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isExtractInterface() <em>Extract Interface</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isExtractInterface()
-     * @generated
-     * @ordered
-     */
-    protected boolean extractInterface = EXTRACT_INTERFACE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected static final String SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getServiceEndpointInterfaceName() <em>Service Endpoint Interface Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServiceEndpointInterfaceName()
-     * @generated
-     * @ordered
-     */
-    protected String serviceEndpointInterfaceName = SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getMethodMap() <em>Method Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMethodMap()
-     * @generated
-     * @ordered
-     */
-    protected Map<IMethod, Map<String, Boolean>> methodMap;
-
-    /**
-     * The cached value of the '{@link #getAnnotationMap() <em>Annotation Map</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getAnnotationMap()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, Boolean> annotationMap;
-
-    /**
-     * The default value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected static final String SOURCE_DIRECTORY_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getSourceDirectory() <em>Source Directory</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSourceDirectory()
-     * @generated
-     * @ordered
-     */
-    protected String sourceDirectory = SOURCE_DIRECTORY_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPortName()
-     * @generated
-     * @ordered
-     */
-    protected static final String PORT_NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getPortName() <em>Port Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPortName()
-     * @generated
-     * @ordered
-     */
-    protected String portName = PORT_NAME_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected Java2WSDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.JAVA2_WS_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isSoap12Binding() {
-        return soap12Binding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSoap12Binding(boolean newSoap12Binding) {
-        boolean oldSoap12Binding = soap12Binding;
-        soap12Binding = newSoap12Binding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING, oldSoap12Binding, soap12Binding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateXSDImports() {
-        return generateXSDImports;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateXSDImports(boolean newGenerateXSDImports) {
-        boolean oldGenerateXSDImports = generateXSDImports;
-        generateXSDImports = newGenerateXSDImports;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS, oldGenerateXSDImports, generateXSDImports));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWSDL() {
-        return generateWSDL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWSDL(boolean newGenerateWSDL) {
-        boolean oldGenerateWSDL = generateWSDL;
-        generateWSDL = newGenerateWSDL;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL, oldGenerateWSDL, generateWSDL));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWrapperFaultBeans() {
-        return generateWrapperFaultBeans;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWrapperFaultBeans(boolean newGenerateWrapperFaultBeans) {
-        boolean oldGenerateWrapperFaultBeans = generateWrapperFaultBeans;
-        generateWrapperFaultBeans = newGenerateWrapperFaultBeans;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS, oldGenerateWrapperFaultBeans, generateWrapperFaultBeans));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isAnnotationProcessingEnabled() {
-        return annotationProcessingEnabled;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAnnotationProcessingEnabled(boolean newAnnotationProcessingEnabled) {
-        boolean oldAnnotationProcessingEnabled = annotationProcessingEnabled;
-        annotationProcessingEnabled = newAnnotationProcessingEnabled;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED, oldAnnotationProcessingEnabled, annotationProcessingEnabled));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWebMethodAnnotation() {
-        return generateWebMethodAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWebMethodAnnotation(boolean newGenerateWebMethodAnnotation) {
-        boolean oldGenerateWebMethodAnnotation = generateWebMethodAnnotation;
-        generateWebMethodAnnotation = newGenerateWebMethodAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION, oldGenerateWebMethodAnnotation, generateWebMethodAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateWebParamAnnotation() {
-        return generateWebParamAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateWebParamAnnotation(boolean newGenerateWebParamAnnotation) {
-        boolean oldGenerateWebParamAnnotation = generateWebParamAnnotation;
-        generateWebParamAnnotation = newGenerateWebParamAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION, oldGenerateWebParamAnnotation, generateWebParamAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateRequestWrapperAnnotation() {
-        return generateRequestWrapperAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateRequestWrapperAnnotation(boolean newGenerateRequestWrapperAnnotation) {
-        boolean oldGenerateRequestWrapperAnnotation = generateRequestWrapperAnnotation;
-        generateRequestWrapperAnnotation = newGenerateRequestWrapperAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION, oldGenerateRequestWrapperAnnotation, generateRequestWrapperAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateResponseWrapperAnnotation() {
-        return generateResponseWrapperAnnotation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateResponseWrapperAnnotation(boolean newGenerateResponseWrapperAnnotation) {
-        boolean oldGenerateResponseWrapperAnnotation = generateResponseWrapperAnnotation;
-        generateResponseWrapperAnnotation = newGenerateResponseWrapperAnnotation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION, oldGenerateResponseWrapperAnnotation, generateResponseWrapperAnnotation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getClasspath() {
-        return classpath;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setClasspath(String newClasspath) {
-        String oldClasspath = classpath;
-        classpath = newClasspath;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH, oldClasspath, classpath));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getJavaStartingPoint() {
-        return javaStartingPoint;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setJavaStartingPoint(String newJavaStartingPoint) {
-        String oldJavaStartingPoint = javaStartingPoint;
-        javaStartingPoint = newJavaStartingPoint;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT, oldJavaStartingPoint, javaStartingPoint));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseServiceEndpointInterface() {
-        return useServiceEndpointInterface;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseServiceEndpointInterface(boolean newUseServiceEndpointInterface) {
-        boolean oldUseServiceEndpointInterface = useServiceEndpointInterface;
-        useServiceEndpointInterface = newUseServiceEndpointInterface;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE, oldUseServiceEndpointInterface, useServiceEndpointInterface));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isExtractInterface() {
-        return extractInterface;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExtractInterface(boolean newExtractInterface) {
-        boolean oldExtractInterface = extractInterface;
-        extractInterface = newExtractInterface;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE, oldExtractInterface, extractInterface));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getServiceEndpointInterfaceName() {
-        return serviceEndpointInterfaceName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setServiceEndpointInterfaceName(String newServiceEndpointInterfaceName) {
-        String oldServiceEndpointInterfaceName = serviceEndpointInterfaceName;
-        serviceEndpointInterfaceName = newServiceEndpointInterfaceName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME, oldServiceEndpointInterfaceName, serviceEndpointInterfaceName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<IMethod, Map<String, Boolean>> getMethodMap() {
-        return methodMap;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setMethodMap(Map<IMethod, Map<String, Boolean>> newMethodMap) {
-        Map<IMethod, Map<String, Boolean>> oldMethodMap = methodMap;
-        methodMap = newMethodMap;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP, oldMethodMap, methodMap));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, Boolean> getAnnotationMap() {
-        return annotationMap;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAnnotationMap(Map<String, Boolean> newAnnotationMap) {
-        Map<String, Boolean> oldAnnotationMap = annotationMap;
-        annotationMap = newAnnotationMap;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP, oldAnnotationMap, annotationMap));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getSourceDirectory() {
-        return sourceDirectory;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSourceDirectory(String newSourceDirectory) {
-        String oldSourceDirectory = sourceDirectory;
-        sourceDirectory = newSourceDirectory;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY, oldSourceDirectory, sourceDirectory));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getPortName() {
-        return portName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setPortName(String newPortName) {
-        String oldPortName = portName;
-        portName = newPortName;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME, oldPortName, portName));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                return isSoap12Binding() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                return isGenerateXSDImports() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                return isGenerateWSDL() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                return isGenerateWrapperFaultBeans() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                return isAnnotationProcessingEnabled() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                return isGenerateWebMethodAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                return isGenerateWebParamAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                return isGenerateRequestWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                return isGenerateResponseWrapperAnnotation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                return getClasspath();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                return getJavaStartingPoint();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                return isUseServiceEndpointInterface() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                return isExtractInterface() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                return getServiceEndpointInterfaceName();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                return getMethodMap();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                return getAnnotationMap();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                return getSourceDirectory();
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                return getPortName();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                setSoap12Binding(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                setGenerateXSDImports(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                setGenerateWSDL(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                setGenerateWrapperFaultBeans(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                setAnnotationProcessingEnabled(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                setGenerateWebMethodAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                setGenerateWebParamAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                setGenerateRequestWrapperAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                setGenerateResponseWrapperAnnotation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                setClasspath((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                setJavaStartingPoint((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                setUseServiceEndpointInterface(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                setExtractInterface(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                setServiceEndpointInterfaceName((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                setMethodMap((Map<IMethod, Map<String, Boolean>>)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                setAnnotationMap((Map<String, Boolean>)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                setSourceDirectory((String)newValue);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                setPortName((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                setSoap12Binding(SOAP12_BINDING_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                setGenerateXSDImports(GENERATE_XSD_IMPORTS_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                setGenerateWSDL(GENERATE_WSDL_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                setGenerateWrapperFaultBeans(GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                setAnnotationProcessingEnabled(ANNOTATION_PROCESSING_ENABLED_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                setGenerateWebMethodAnnotation(GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                setGenerateWebParamAnnotation(GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                setGenerateRequestWrapperAnnotation(GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                setGenerateResponseWrapperAnnotation(GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                setClasspath(CLASSPATH_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                setJavaStartingPoint(JAVA_STARTING_POINT_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                setUseServiceEndpointInterface(USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                setExtractInterface(EXTRACT_INTERFACE_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                setServiceEndpointInterfaceName(SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                setMethodMap((Map<IMethod, Map<String, Boolean>>)null);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                setAnnotationMap((Map<String, Boolean>)null);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                setSourceDirectory(SOURCE_DIRECTORY_EDEFAULT);
-                return;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                setPortName(PORT_NAME_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING:
-                return soap12Binding != SOAP12_BINDING_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS:
-                return generateXSDImports != GENERATE_XSD_IMPORTS_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL:
-                return generateWSDL != GENERATE_WSDL_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS:
-                return generateWrapperFaultBeans != GENERATE_WRAPPER_FAULT_BEANS_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED:
-                return annotationProcessingEnabled != ANNOTATION_PROCESSING_ENABLED_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION:
-                return generateWebMethodAnnotation != GENERATE_WEB_METHOD_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION:
-                return generateWebParamAnnotation != GENERATE_WEB_PARAM_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                return generateRequestWrapperAnnotation != GENERATE_REQUEST_WRAPPER_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                return generateResponseWrapperAnnotation != GENERATE_RESPONSE_WRAPPER_ANNOTATION_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__CLASSPATH:
-                return CLASSPATH_EDEFAULT == null ? classpath != null : !CLASSPATH_EDEFAULT.equals(classpath);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__JAVA_STARTING_POINT:
-                return JAVA_STARTING_POINT_EDEFAULT == null ? javaStartingPoint != null : !JAVA_STARTING_POINT_EDEFAULT.equals(javaStartingPoint);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__USE_SERVICE_ENDPOINT_INTERFACE:
-                return useServiceEndpointInterface != USE_SERVICE_ENDPOINT_INTERFACE_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__EXTRACT_INTERFACE:
-                return extractInterface != EXTRACT_INTERFACE_EDEFAULT;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SERVICE_ENDPOINT_INTERFACE_NAME:
-                return SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT == null ? serviceEndpointInterfaceName != null : !SERVICE_ENDPOINT_INTERFACE_NAME_EDEFAULT.equals(serviceEndpointInterfaceName);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__METHOD_MAP:
-                return methodMap != null;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_MAP:
-                return annotationMap != null;
-            case CXFPackage.JAVA2_WS_DATA_MODEL__SOURCE_DIRECTORY:
-                return SOURCE_DIRECTORY_EDEFAULT == null ? sourceDirectory != null : !SOURCE_DIRECTORY_EDEFAULT.equals(sourceDirectory);
-            case CXFPackage.JAVA2_WS_DATA_MODEL__PORT_NAME:
-                return PORT_NAME_EDEFAULT == null ? portName != null : !PORT_NAME_EDEFAULT.equals(portName);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == Java2WSContext.class) {
-            switch (derivedFeatureID) {
-                case CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING: return CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION;
-                case CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
-                default: return -1;
-            }
-        }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == Java2WSContext.class) {
-            switch (baseFeatureID) {
-                case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING: return CXFPackage.JAVA2_WS_DATA_MODEL__SOAP12_BINDING;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_XSD_IMPORTS;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WSDL;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WRAPPER_FAULT_BEANS;
-                case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED: return CXFPackage.JAVA2_WS_DATA_MODEL__ANNOTATION_PROCESSING_ENABLED;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_METHOD_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_WEB_PARAM_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_REQUEST_WRAPPER_ANNOTATION;
-                case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION: return CXFPackage.JAVA2_WS_DATA_MODEL__GENERATE_RESPONSE_WRAPPER_ANNOTATION;
-                default: return -1;
-            }
-        }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (soap12Binding: ");
-        result.append(soap12Binding);
-        result.append(", generateXSDImports: ");
-        result.append(generateXSDImports);
-        result.append(", generateWSDL: ");
-        result.append(generateWSDL);
-        result.append(", generateWrapperFaultBeans: ");
-        result.append(generateWrapperFaultBeans);
-        result.append(", annotationProcessingEnabled: ");
-        result.append(annotationProcessingEnabled);
-        result.append(", generateWebMethodAnnotation: ");
-        result.append(generateWebMethodAnnotation);
-        result.append(", generateWebParamAnnotation: ");
-        result.append(generateWebParamAnnotation);
-        result.append(", generateRequestWrapperAnnotation: ");
-        result.append(generateRequestWrapperAnnotation);
-        result.append(", generateResponseWrapperAnnotation: ");
-        result.append(generateResponseWrapperAnnotation);
-        result.append(", classpath: ");
-        result.append(classpath);
-        result.append(", javaStartingPoint: ");
-        result.append(javaStartingPoint);
-        result.append(", useServiceEndpointInterface: ");
-        result.append(useServiceEndpointInterface);
-        result.append(", extractInterface: ");
-        result.append(extractInterface);
-        result.append(", serviceEndpointInterfaceName: ");
-        result.append(serviceEndpointInterfaceName);
-        result.append(", methodMap: ");
-        result.append(methodMap);
-        result.append(", annotationMap: ");
-        result.append(annotationMap);
-        result.append(", sourceDirectory: ");
-        result.append(sourceDirectory);
-        result.append(", portName: ");
-        result.append(portName);
-        result.append(')');
-        return result.toString();
-    }
-
-} //Java2WSDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
deleted file mode 100644
index 93a7053..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
+++ /dev/null
@@ -1,1397 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: WSDL2JavaDataModelImpl.java,v 1.2 2009/04/06 21:33:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.impl;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>WSDL2 Java Data Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isGenerateImplementation <em>Generate Implementation</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isProcessSOAPHeaders <em>Process SOAP Headers</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultNamespacePackageNameMapping <em>Load Default Namespace Package Name Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isLoadDefaultExcludesNamepsaceMapping <em>Load Default Excludes Namepsace Mapping</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isValidate <em>Validate</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getWsdlVersion <em>Wsdl Version</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isUseDefaultValues <em>Use Default Values</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcArgs <em>Xjc Args</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isNoAddressBinding <em>No Address Binding</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcUseDefaultValues <em>Xjc Use Default Values</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToString <em>Xjc To String</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringMultiLine <em>Xjc To String Multi Line</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcToStringSimple <em>Xjc To String Simple</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcLocator <em>Xjc Locator</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcSyncMethods <em>Xjc Sync Methods</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isXjcMarkGenerated <em>Xjc Mark Generated</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getXjcEpisodeFile <em>Xjc Episode File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#isAutoNameResolution <em>Auto Name Resolution</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getIncludedNamespaces <em>Included Namespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getBindingFiles <em>Binding Files</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getExcludedNamespaces <em>Excluded Namespaces</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getCatalogFile <em>Catalog File</em>}</li>
- *   <li>{@link org.eclipse.jst.ws.internal.cxf.core.model.impl.WSDL2JavaDataModelImpl#getJavaSourceFolder <em>Java Source Folder</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class WSDL2JavaDataModelImpl extends CXFDataModelImpl implements WSDL2JavaDataModel {
-    /**
-     * The default value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateImplementation()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean GENERATE_IMPLEMENTATION_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isGenerateImplementation() <em>Generate Implementation</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isGenerateImplementation()
-     * @generated
-     * @ordered
-     */
-    protected boolean generateImplementation = GENERATE_IMPLEMENTATION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean PROCESS_SOAP_HEADERS_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isProcessSOAPHeaders() <em>Process SOAP Headers</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isProcessSOAPHeaders()
-     * @generated
-     * @ordered
-     */
-    protected boolean processSOAPHeaders = PROCESS_SOAP_HEADERS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isLoadDefaultNamespacePackageNameMapping() <em>Load Default Namespace Package Name Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultNamespacePackageNameMapping()
-     * @generated
-     * @ordered
-     */
-    protected boolean loadDefaultNamespacePackageNameMapping = LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isLoadDefaultExcludesNamepsaceMapping() <em>Load Default Excludes Namepsace Mapping</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isLoadDefaultExcludesNamepsaceMapping()
-     * @generated
-     * @ordered
-     */
-    protected boolean loadDefaultExcludesNamepsaceMapping = LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isValidate() <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isValidate()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean VALIDATE_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isValidate() <em>Validate</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isValidate()
-     * @generated
-     * @ordered
-     */
-    protected boolean validate = VALIDATE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlVersion()
-     * @generated
-     * @ordered
-     */
-    protected static final String WSDL_VERSION_EDEFAULT = "1.1";
-
-    /**
-     * The cached value of the '{@link #getWsdlVersion() <em>Wsdl Version</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getWsdlVersion()
-     * @generated
-     * @ordered
-     */
-    protected String wsdlVersion = WSDL_VERSION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean USE_DEFAULT_VALUES_EDEFAULT = true;
-
-    /**
-     * The cached value of the '{@link #isUseDefaultValues() <em>Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected boolean useDefaultValues = USE_DEFAULT_VALUES_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcArgs()
-     * @generated
-     * @ordered
-     */
-    protected static final String XJC_ARGS_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getXjcArgs() <em>Xjc Args</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcArgs()
-     * @generated
-     * @ordered
-     */
-    protected String xjcArgs = XJC_ARGS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isNoAddressBinding()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean NO_ADDRESS_BINDING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isNoAddressBinding() <em>No Address Binding</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isNoAddressBinding()
-     * @generated
-     * @ordered
-     */
-    protected boolean noAddressBinding = NO_ADDRESS_BINDING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_USE_DEFAULT_VALUES_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcUseDefaultValues() <em>Xjc Use Default Values</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcUseDefaultValues()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcUseDefaultValues = XJC_USE_DEFAULT_VALUES_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToString()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToString() <em>Xjc To String</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToString()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToString = XJC_TO_STRING_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_MULTI_LINE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToStringMultiLine() <em>Xjc To String Multi Line</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringMultiLine()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToStringMultiLine = XJC_TO_STRING_MULTI_LINE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringSimple()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_TO_STRING_SIMPLE_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcToStringSimple() <em>Xjc To String Simple</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcToStringSimple()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcToStringSimple = XJC_TO_STRING_SIMPLE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcLocator()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_LOCATOR_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcLocator() <em>Xjc Locator</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcLocator()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcLocator = XJC_LOCATOR_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcSyncMethods()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_SYNC_METHODS_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcSyncMethods() <em>Xjc Sync Methods</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcSyncMethods()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcSyncMethods = XJC_SYNC_METHODS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcMarkGenerated()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean XJC_MARK_GENERATED_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isXjcMarkGenerated() <em>Xjc Mark Generated</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isXjcMarkGenerated()
-     * @generated
-     * @ordered
-     */
-    protected boolean xjcMarkGenerated = XJC_MARK_GENERATED_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcEpisodeFile()
-     * @generated
-     * @ordered
-     */
-    protected static final String XJC_EPISODE_FILE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getXjcEpisodeFile() <em>Xjc Episode File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getXjcEpisodeFile()
-     * @generated
-     * @ordered
-     */
-    protected String xjcEpisodeFile = XJC_EPISODE_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAutoNameResolution()
-     * @generated
-     * @ordered
-     */
-    protected static final boolean AUTO_NAME_RESOLUTION_EDEFAULT = false;
-
-    /**
-     * The cached value of the '{@link #isAutoNameResolution() <em>Auto Name Resolution</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #isAutoNameResolution()
-     * @generated
-     * @ordered
-     */
-    protected boolean autoNameResolution = AUTO_NAME_RESOLUTION_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getIncludedNamespaces() <em>Included Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getIncludedNamespaces()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, String> includedNamespaces;
-
-    /**
-     * The cached value of the '{@link #getBindingFiles() <em>Binding Files</em>}' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getBindingFiles()
-     * @generated
-     * @ordered
-     */
-    protected EList<String> bindingFiles;
-
-    /**
-     * The cached value of the '{@link #getExcludedNamespaces() <em>Excluded Namespaces</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getExcludedNamespaces()
-     * @generated
-     * @ordered
-     */
-    protected Map<String, String> excludedNamespaces;
-
-    /**
-     * The default value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCatalogFile()
-     * @generated
-     * @ordered
-     */
-    protected static final String CATALOG_FILE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getCatalogFile() <em>Catalog File</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getCatalogFile()
-     * @generated
-     * @ordered
-     */
-    protected String catalogFile = CATALOG_FILE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaSourceFolder()
-     * @generated
-     * @ordered
-     */
-    protected static final String JAVA_SOURCE_FOLDER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getJavaSourceFolder() <em>Java Source Folder</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getJavaSourceFolder()
-     * @generated
-     * @ordered
-     */
-    protected String javaSourceFolder = JAVA_SOURCE_FOLDER_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected WSDL2JavaDataModelImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    protected EClass eStaticClass() {
-        return CXFPackage.Literals.WSDL2_JAVA_DATA_MODEL;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isGenerateImplementation() {
-        return generateImplementation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGenerateImplementation(boolean newGenerateImplementation) {
-        boolean oldGenerateImplementation = generateImplementation;
-        generateImplementation = newGenerateImplementation;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION, oldGenerateImplementation, generateImplementation));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isProcessSOAPHeaders() {
-        return processSOAPHeaders;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setProcessSOAPHeaders(boolean newProcessSOAPHeaders) {
-        boolean oldProcessSOAPHeaders = processSOAPHeaders;
-        processSOAPHeaders = newProcessSOAPHeaders;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS, oldProcessSOAPHeaders, processSOAPHeaders));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isLoadDefaultNamespacePackageNameMapping() {
-        return loadDefaultNamespacePackageNameMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setLoadDefaultNamespacePackageNameMapping(boolean newLoadDefaultNamespacePackageNameMapping) {
-        boolean oldLoadDefaultNamespacePackageNameMapping = loadDefaultNamespacePackageNameMapping;
-        loadDefaultNamespacePackageNameMapping = newLoadDefaultNamespacePackageNameMapping;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING, oldLoadDefaultNamespacePackageNameMapping, loadDefaultNamespacePackageNameMapping));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isLoadDefaultExcludesNamepsaceMapping() {
-        return loadDefaultExcludesNamepsaceMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setLoadDefaultExcludesNamepsaceMapping(boolean newLoadDefaultExcludesNamepsaceMapping) {
-        boolean oldLoadDefaultExcludesNamepsaceMapping = loadDefaultExcludesNamepsaceMapping;
-        loadDefaultExcludesNamepsaceMapping = newLoadDefaultExcludesNamepsaceMapping;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING, oldLoadDefaultExcludesNamepsaceMapping, loadDefaultExcludesNamepsaceMapping));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isValidate() {
-        return validate;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setValidate(boolean newValidate) {
-        boolean oldValidate = validate;
-        validate = newValidate;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE, oldValidate, validate));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getWsdlVersion() {
-        return wsdlVersion;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setWsdlVersion(String newWsdlVersion) {
-        String oldWsdlVersion = wsdlVersion;
-        wsdlVersion = newWsdlVersion;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION, oldWsdlVersion, wsdlVersion));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isUseDefaultValues() {
-        return useDefaultValues;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUseDefaultValues(boolean newUseDefaultValues) {
-        boolean oldUseDefaultValues = useDefaultValues;
-        useDefaultValues = newUseDefaultValues;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES, oldUseDefaultValues, useDefaultValues));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getXjcArgs() {
-        return xjcArgs;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcArgs(String newXjcArgs) {
-        String oldXjcArgs = xjcArgs;
-        xjcArgs = newXjcArgs;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS, oldXjcArgs, xjcArgs));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isNoAddressBinding() {
-        return noAddressBinding;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setNoAddressBinding(boolean newNoAddressBinding) {
-        boolean oldNoAddressBinding = noAddressBinding;
-        noAddressBinding = newNoAddressBinding;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING, oldNoAddressBinding, noAddressBinding));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcUseDefaultValues() {
-        return xjcUseDefaultValues;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcUseDefaultValues(boolean newXjcUseDefaultValues) {
-        boolean oldXjcUseDefaultValues = xjcUseDefaultValues;
-        xjcUseDefaultValues = newXjcUseDefaultValues;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES, oldXjcUseDefaultValues, xjcUseDefaultValues));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToString() {
-        return xjcToString;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToString(boolean newXjcToString) {
-        boolean oldXjcToString = xjcToString;
-        xjcToString = newXjcToString;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING, oldXjcToString, xjcToString));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToStringMultiLine() {
-        return xjcToStringMultiLine;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToStringMultiLine(boolean newXjcToStringMultiLine) {
-        boolean oldXjcToStringMultiLine = xjcToStringMultiLine;
-        xjcToStringMultiLine = newXjcToStringMultiLine;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE, oldXjcToStringMultiLine, xjcToStringMultiLine));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcToStringSimple() {
-        return xjcToStringSimple;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcToStringSimple(boolean newXjcToStringSimple) {
-        boolean oldXjcToStringSimple = xjcToStringSimple;
-        xjcToStringSimple = newXjcToStringSimple;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE, oldXjcToStringSimple, xjcToStringSimple));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcLocator() {
-        return xjcLocator;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcLocator(boolean newXjcLocator) {
-        boolean oldXjcLocator = xjcLocator;
-        xjcLocator = newXjcLocator;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR, oldXjcLocator, xjcLocator));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcSyncMethods() {
-        return xjcSyncMethods;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcSyncMethods(boolean newXjcSyncMethods) {
-        boolean oldXjcSyncMethods = xjcSyncMethods;
-        xjcSyncMethods = newXjcSyncMethods;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS, oldXjcSyncMethods, xjcSyncMethods));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isXjcMarkGenerated() {
-        return xjcMarkGenerated;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcMarkGenerated(boolean newXjcMarkGenerated) {
-        boolean oldXjcMarkGenerated = xjcMarkGenerated;
-        xjcMarkGenerated = newXjcMarkGenerated;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED, oldXjcMarkGenerated, xjcMarkGenerated));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getXjcEpisodeFile() {
-        return xjcEpisodeFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setXjcEpisodeFile(String newXjcEpisodeFile) {
-        String oldXjcEpisodeFile = xjcEpisodeFile;
-        xjcEpisodeFile = newXjcEpisodeFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE, oldXjcEpisodeFile, xjcEpisodeFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean isAutoNameResolution() {
-        return autoNameResolution;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setAutoNameResolution(boolean newAutoNameResolution) {
-        boolean oldAutoNameResolution = autoNameResolution;
-        autoNameResolution = newAutoNameResolution;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION, oldAutoNameResolution, autoNameResolution));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, String> getIncludedNamespaces() {
-        return includedNamespaces;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setIncludedNamespaces(Map<String, String> newIncludedNamespaces) {
-        Map<String, String> oldIncludedNamespaces = includedNamespaces;
-        includedNamespaces = newIncludedNamespaces;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES, oldIncludedNamespaces, includedNamespaces));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EList<String> getBindingFiles() {
-        if (bindingFiles == null) {
-            bindingFiles = new EDataTypeUniqueEList<String>(String.class, this, CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES);
-        }
-        return bindingFiles;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Map<String, String> getExcludedNamespaces() {
-        return excludedNamespaces;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setExcludedNamespaces(Map<String, String> newExcludedNamespaces) {
-        Map<String, String> oldExcludedNamespaces = excludedNamespaces;
-        excludedNamespaces = newExcludedNamespaces;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES, oldExcludedNamespaces, excludedNamespaces));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getCatalogFile() {
-        return catalogFile;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setCatalogFile(String newCatalogFile) {
-        String oldCatalogFile = catalogFile;
-        catalogFile = newCatalogFile;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE, oldCatalogFile, catalogFile));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getJavaSourceFolder() {
-        return javaSourceFolder;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setJavaSourceFolder(String newJavaSourceFolder) {
-        String oldJavaSourceFolder = javaSourceFolder;
-        javaSourceFolder = newJavaSourceFolder;
-        if (eNotificationRequired())
-            eNotify(new ENotificationImpl(this, Notification.SET, CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER, oldJavaSourceFolder, javaSourceFolder));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                return isGenerateImplementation() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                return isProcessSOAPHeaders() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                return isLoadDefaultNamespacePackageNameMapping() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                return isLoadDefaultExcludesNamepsaceMapping() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                return isValidate() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                return getWsdlVersion();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                return isUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                return getXjcArgs();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                return isNoAddressBinding() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                return isXjcUseDefaultValues() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                return isXjcToString() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                return isXjcToStringMultiLine() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                return isXjcToStringSimple() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                return isXjcLocator() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                return isXjcSyncMethods() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                return isXjcMarkGenerated() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                return getXjcEpisodeFile();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                return isAutoNameResolution() ? Boolean.TRUE : Boolean.FALSE;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                return getIncludedNamespaces();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                return getBindingFiles();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                return getExcludedNamespaces();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                return getCatalogFile();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                return getJavaSourceFolder();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                setGenerateImplementation(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                setProcessSOAPHeaders(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                setLoadDefaultNamespacePackageNameMapping(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                setLoadDefaultExcludesNamepsaceMapping(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                setValidate(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                setWsdlVersion((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                setUseDefaultValues(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                setXjcArgs((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                setNoAddressBinding(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                setXjcUseDefaultValues(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                setXjcToString(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                setXjcToStringMultiLine(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                setXjcToStringSimple(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                setXjcLocator(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                setXjcSyncMethods(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                setXjcMarkGenerated(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                setXjcEpisodeFile((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                setAutoNameResolution(((Boolean)newValue).booleanValue());
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                setIncludedNamespaces((Map<String, String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                getBindingFiles().clear();
-                getBindingFiles().addAll((Collection<? extends String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                setExcludedNamespaces((Map<String, String>)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                setCatalogFile((String)newValue);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                setJavaSourceFolder((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                setGenerateImplementation(GENERATE_IMPLEMENTATION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                setProcessSOAPHeaders(PROCESS_SOAP_HEADERS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                setLoadDefaultNamespacePackageNameMapping(LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                setLoadDefaultExcludesNamepsaceMapping(LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                setValidate(VALIDATE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                setWsdlVersion(WSDL_VERSION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                setUseDefaultValues(USE_DEFAULT_VALUES_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                setXjcArgs(XJC_ARGS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                setNoAddressBinding(NO_ADDRESS_BINDING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                setXjcUseDefaultValues(XJC_USE_DEFAULT_VALUES_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                setXjcToString(XJC_TO_STRING_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                setXjcToStringMultiLine(XJC_TO_STRING_MULTI_LINE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                setXjcToStringSimple(XJC_TO_STRING_SIMPLE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                setXjcLocator(XJC_LOCATOR_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                setXjcSyncMethods(XJC_SYNC_METHODS_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                setXjcMarkGenerated(XJC_MARK_GENERATED_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                setXjcEpisodeFile(XJC_EPISODE_FILE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                setAutoNameResolution(AUTO_NAME_RESOLUTION_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                setIncludedNamespaces((Map<String, String>)null);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                getBindingFiles().clear();
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                setExcludedNamespaces((Map<String, String>)null);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                setCatalogFile(CATALOG_FILE_EDEFAULT);
-                return;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                setJavaSourceFolder(JAVA_SOURCE_FOLDER_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION:
-                return generateImplementation != GENERATE_IMPLEMENTATION_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS:
-                return processSOAPHeaders != PROCESS_SOAP_HEADERS_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                return loadDefaultNamespacePackageNameMapping != LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                return loadDefaultExcludesNamepsaceMapping != LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE:
-                return validate != VALIDATE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION:
-                return WSDL_VERSION_EDEFAULT == null ? wsdlVersion != null : !WSDL_VERSION_EDEFAULT.equals(wsdlVersion);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES:
-                return useDefaultValues != USE_DEFAULT_VALUES_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS:
-                return XJC_ARGS_EDEFAULT == null ? xjcArgs != null : !XJC_ARGS_EDEFAULT.equals(xjcArgs);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING:
-                return noAddressBinding != NO_ADDRESS_BINDING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES:
-                return xjcUseDefaultValues != XJC_USE_DEFAULT_VALUES_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING:
-                return xjcToString != XJC_TO_STRING_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE:
-                return xjcToStringMultiLine != XJC_TO_STRING_MULTI_LINE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE:
-                return xjcToStringSimple != XJC_TO_STRING_SIMPLE_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR:
-                return xjcLocator != XJC_LOCATOR_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS:
-                return xjcSyncMethods != XJC_SYNC_METHODS_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED:
-                return xjcMarkGenerated != XJC_MARK_GENERATED_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE:
-                return XJC_EPISODE_FILE_EDEFAULT == null ? xjcEpisodeFile != null : !XJC_EPISODE_FILE_EDEFAULT.equals(xjcEpisodeFile);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION:
-                return autoNameResolution != AUTO_NAME_RESOLUTION_EDEFAULT;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__INCLUDED_NAMESPACES:
-                return includedNamespaces != null;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__BINDING_FILES:
-                return bindingFiles != null && !bindingFiles.isEmpty();
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__EXCLUDED_NAMESPACES:
-                return excludedNamespaces != null;
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__CATALOG_FILE:
-                return CATALOG_FILE_EDEFAULT == null ? catalogFile != null : !CATALOG_FILE_EDEFAULT.equals(catalogFile);
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL__JAVA_SOURCE_FOLDER:
-                return JAVA_SOURCE_FOLDER_EDEFAULT == null ? javaSourceFolder != null : !JAVA_SOURCE_FOLDER_EDEFAULT.equals(javaSourceFolder);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-        if (baseClass == WSDL2JavaContext.class) {
-            switch (derivedFeatureID) {
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE: return CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE;
-                case CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION;
-                default: return -1;
-            }
-        }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-        if (baseClass == WSDL2JavaContext.class) {
-            switch (baseFeatureID) {
-                case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__GENERATE_IMPLEMENTATION;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__PROCESS_SOAP_HEADERS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__VALIDATE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__WSDL_VERSION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__WSDL_VERSION;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_ARGS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_ARGS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__NO_ADDRESS_BINDING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_USE_DEFAULT_VALUES;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_MULTI_LINE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_TO_STRING_SIMPLE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_LOCATOR;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_SYNC_METHODS;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_MARK_GENERATED;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_EPISODE_FILE: return CXFPackage.WSDL2_JAVA_DATA_MODEL__XJC_EPISODE_FILE;
-                case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION: return CXFPackage.WSDL2_JAVA_DATA_MODEL__AUTO_NAME_RESOLUTION;
-                default: return -1;
-            }
-        }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    @Override
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (generateImplementation: ");
-        result.append(generateImplementation);
-        result.append(", processSOAPHeaders: ");
-        result.append(processSOAPHeaders);
-        result.append(", loadDefaultNamespacePackageNameMapping: ");
-        result.append(loadDefaultNamespacePackageNameMapping);
-        result.append(", loadDefaultExcludesNamepsaceMapping: ");
-        result.append(loadDefaultExcludesNamepsaceMapping);
-        result.append(", validate: ");
-        result.append(validate);
-        result.append(", wsdlVersion: ");
-        result.append(wsdlVersion);
-        result.append(", useDefaultValues: ");
-        result.append(useDefaultValues);
-        result.append(", xjcArgs: ");
-        result.append(xjcArgs);
-        result.append(", noAddressBinding: ");
-        result.append(noAddressBinding);
-        result.append(", xjcUseDefaultValues: ");
-        result.append(xjcUseDefaultValues);
-        result.append(", xjcToString: ");
-        result.append(xjcToString);
-        result.append(", xjcToStringMultiLine: ");
-        result.append(xjcToStringMultiLine);
-        result.append(", xjcToStringSimple: ");
-        result.append(xjcToStringSimple);
-        result.append(", xjcLocator: ");
-        result.append(xjcLocator);
-        result.append(", xjcSyncMethods: ");
-        result.append(xjcSyncMethods);
-        result.append(", xjcMarkGenerated: ");
-        result.append(xjcMarkGenerated);
-        result.append(", xjcEpisodeFile: ");
-        result.append(xjcEpisodeFile);
-        result.append(", autoNameResolution: ");
-        result.append(autoNameResolution);
-        result.append(", includedNamespaces: ");
-        result.append(includedNamespaces);
-        result.append(", bindingFiles: ");
-        result.append(bindingFiles);
-        result.append(", excludedNamespaces: ");
-        result.append(excludedNamespaces);
-        result.append(", catalogFile: ");
-        result.append(catalogFile);
-        result.append(", javaSourceFolder: ");
-        result.append(javaSourceFolder);
-        result.append(')');
-        return result.toString();
-    }
-
-} //WSDL2JavaDataModelImpl
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
deleted file mode 100644
index 4ab8047..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFAdapterFactory.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFAdapterFactory.java,v 1.2 2009/01/26 15:28:14 sclarke Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFAdapterFactory extends AdapterFactoryImpl {
-    /**
-     * The cached model package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected static CXFPackage modelPackage;
-
-    /**
-     * Creates an instance of the adapter factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFAdapterFactory() {
-        if (modelPackage == null) {
-            modelPackage = CXFPackage.eINSTANCE;
-        }
-    }
-
-    /**
-     * Returns whether this factory is applicable for the type of the object.
-     * <!-- begin-user-doc -->
-     * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-     * <!-- end-user-doc -->
-     * @return whether this factory is applicable for the type of the object.
-     * @generated
-     */
-    @Override
-    public boolean isFactoryForType(Object object) {
-        if (object == modelPackage) {
-            return true;
-        }
-        if (object instanceof EObject) {
-            return ((EObject)object).eClass().getEPackage() == modelPackage;
-        }
-        return false;
-    }
-
-    /**
-     * The switch that delegates to the <code>createXXX</code> methods.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected CXFSwitch<Adapter> modelSwitch =
-        new CXFSwitch<Adapter>() {
-            @Override
-            public Adapter caseCXFContext(CXFContext object) {
-                return createCXFContextAdapter();
-            }
-            @Override
-            public Adapter caseCXFDataModel(CXFDataModel object) {
-                return createCXFDataModelAdapter();
-            }
-            @Override
-            public Adapter caseJava2WSContext(Java2WSContext object) {
-                return createJava2WSContextAdapter();
-            }
-            @Override
-            public Adapter caseJava2WSDataModel(Java2WSDataModel object) {
-                return createJava2WSDataModelAdapter();
-            }
-            @Override
-            public Adapter caseWSDL2JavaContext(WSDL2JavaContext object) {
-                return createWSDL2JavaContextAdapter();
-            }
-            @Override
-            public Adapter caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
-                return createWSDL2JavaDataModelAdapter();
-            }
-            @Override
-            public Adapter defaultCase(EObject object) {
-                return createEObjectAdapter();
-            }
-        };
-
-    /**
-     * Creates an adapter for the <code>target</code>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param target the object to adapt.
-     * @return the adapter for the <code>target</code>.
-     * @generated
-     */
-    @Override
-    public Adapter createAdapter(Notifier target) {
-        return modelSwitch.doSwitch((EObject)target);
-    }
-
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFContext <em>Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFContext
-     * @generated
-     */
-    public Adapter createCXFContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel <em>Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel
-     * @generated
-     */
-    public Adapter createCXFDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext <em>Java2 WS Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext
-     * @generated
-     */
-    public Adapter createJava2WSContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel <em>Java2 WS Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel
-     * @generated
-     */
-    public Adapter createJava2WSDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext <em>WSDL2 Java Context</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext
-     * @generated
-     */
-    public Adapter createWSDL2JavaContextAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for an object of class '{@link org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel <em>WSDL2 Java Data Model</em>}'.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null so that we can easily ignore cases;
-     * it's useful to ignore a case when inheritance will catch all the cases anyway.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @see org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel
-     * @generated
-     */
-    public Adapter createWSDL2JavaDataModelAdapter() {
-        return null;
-    }
-
-    /**
-     * Creates a new adapter for the default case.
-     * <!-- begin-user-doc -->
-     * This default implementation returns null.
-     * <!-- end-user-doc -->
-     * @return the new adapter.
-     * @generated
-     */
-    public Adapter createEObjectAdapter() {
-        return null;
-    }
-
-} //CXFAdapterFactory
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
deleted file mode 100644
index 4c0f84b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/util/CXFSwitch.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *
- * $Id: CXFSwitch.java,v 1.1 2008/11/10 20:37:45 david_williams Exp $
- */
-package org.eclipse.jst.ws.internal.cxf.core.model.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.ws.internal.cxf.core.model.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage
- * @generated
- */
-public class CXFSwitch<T> {
-    /**
-     * The cached model package
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected static CXFPackage modelPackage;
-
-    /**
-     * Creates an instance of the switch.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public CXFSwitch() {
-        if (modelPackage == null) {
-            modelPackage = CXFPackage.eINSTANCE;
-        }
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    public T doSwitch(EObject theEObject) {
-        return doSwitch(theEObject.eClass(), theEObject);
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    protected T doSwitch(EClass theEClass, EObject theEObject) {
-        if (theEClass.eContainer() == modelPackage) {
-            return doSwitch(theEClass.getClassifierID(), theEObject);
-        }
-        else {
-            List<EClass> eSuperTypes = theEClass.getESuperTypes();
-            return
-                eSuperTypes.isEmpty() ?
-                    defaultCase(theEObject) :
-                    doSwitch(eSuperTypes.get(0), theEObject);
-        }
-    }
-
-    /**
-     * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the first non-null result returned by a <code>caseXXX</code> call.
-     * @generated
-     */
-    protected T doSwitch(int classifierID, EObject theEObject) {
-        switch (classifierID) {
-            case CXFPackage.CXF_CONTEXT: {
-                CXFContext cxfContext = (CXFContext)theEObject;
-                T result = caseCXFContext(cxfContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.CXF_DATA_MODEL: {
-                CXFDataModel cxfDataModel = (CXFDataModel)theEObject;
-                T result = caseCXFDataModel(cxfDataModel);
-                if (result == null) result = caseCXFContext(cxfDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.JAVA2_WS_CONTEXT: {
-                Java2WSContext java2WSContext = (Java2WSContext)theEObject;
-                T result = caseJava2WSContext(java2WSContext);
-                if (result == null) result = caseCXFContext(java2WSContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.JAVA2_WS_DATA_MODEL: {
-                Java2WSDataModel java2WSDataModel = (Java2WSDataModel)theEObject;
-                T result = caseJava2WSDataModel(java2WSDataModel);
-                if (result == null) result = caseCXFDataModel(java2WSDataModel);
-                if (result == null) result = caseJava2WSContext(java2WSDataModel);
-                if (result == null) result = caseCXFContext(java2WSDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.WSDL2_JAVA_CONTEXT: {
-                WSDL2JavaContext wsdl2JavaContext = (WSDL2JavaContext)theEObject;
-                T result = caseWSDL2JavaContext(wsdl2JavaContext);
-                if (result == null) result = caseCXFContext(wsdl2JavaContext);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            case CXFPackage.WSDL2_JAVA_DATA_MODEL: {
-                WSDL2JavaDataModel wsdl2JavaDataModel = (WSDL2JavaDataModel)theEObject;
-                T result = caseWSDL2JavaDataModel(wsdl2JavaDataModel);
-                if (result == null) result = caseCXFDataModel(wsdl2JavaDataModel);
-                if (result == null) result = caseWSDL2JavaContext(wsdl2JavaDataModel);
-                if (result == null) result = caseCXFContext(wsdl2JavaDataModel);
-                if (result == null) result = defaultCase(theEObject);
-                return result;
-            }
-            default: return defaultCase(theEObject);
-        }
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseCXFContext(CXFContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseCXFDataModel(CXFDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Java2 WS Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseJava2WSContext(Java2WSContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>Java2 WS Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseJava2WSDataModel(Java2WSDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Context</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseWSDL2JavaContext(WSDL2JavaContext object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>WSDL2 Java Data Model</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-     * @generated
-     */
-    public T caseWSDL2JavaDataModel(WSDL2JavaDataModel object) {
-        return null;
-    }
-
-    /**
-     * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * <!-- begin-user-doc -->
-     * This implementation returns null;
-     * returning a non-null result will terminate the switch, but this is the last case anyway.
-     * <!-- end-user-doc -->
-     * @param object the target of the switch.
-     * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-     * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-     * @generated
-     */
-    public T defaultCase(EObject object) {
-        return null;
-    }
-
-} //CXFSwitch
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
deleted file mode 100644
index b8db2cc..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/JavaResourceChangeListener.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the <code>IJavaProject</code> src folder.
- * 
- * @author sclarke
- */
-public class JavaResourceChangeListener implements IResourceChangeListener {
-    private List<IResource> changedResources = new ArrayList<IResource>();
-
-    private String sourceDirectoryPath;
-    
-    /**
-     * Constructs a JavaResourceChangeListener instance.
-     * 
-     * @param sourceDirectoryPath
-     */
-    public JavaResourceChangeListener(String sourceDirectoryPath) {
-        this.sourceDirectoryPath = sourceDirectoryPath;
-    }
-    
-    public void resourceChanged(IResourceChangeEvent event) {
-        if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
-            return;
-        }
-        IResourceDelta rootDelta = event.getDelta();
-
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IFolder srcFolder = workspaceRoot.getFolder(new Path(sourceDirectoryPath));
-        IPath srcFolderPath = srcFolder.getFullPath();
-        if (!srcFolderPath.hasTrailingSeparator()) {
-            srcFolderPath = srcFolderPath.addTrailingSeparator();
-        }
-
-        IResourceDelta javaResourceDelta = rootDelta.findMember(srcFolderPath);
-
-        if (javaResourceDelta == null) {
-            return;
-        }
-
-        IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
-            public boolean visit(IResourceDelta delta) {
-                if (delta.getKind() != IResourceDelta.ADDED) {
-                    return true;
-                }
-                IResource resource = delta.getResource();
-                changedResources.add(resource);
-                return true;
-            }
-        };
-        try {
-            javaResourceDelta.accept(visitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-    
-    public List<IResource> getChangedResources() {
-        return changedResources;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
deleted file mode 100644
index bd1b5e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/resources/WebContentChangeListener.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.resources;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * Listens for changes to the web projects WebContent folder.
- * 
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WebContentChangeListener implements IResourceChangeListener {
-    private List<IResource> changedResources = new ArrayList<IResource>();
-
-    private String projectName;
-    
-    public WebContentChangeListener(String projectName) {
-        this.projectName = projectName;
-    }
-    
-    public void resourceChanged(IResourceChangeEvent event) {
-        if (event.getType() != IResourceChangeEvent.POST_CHANGE) {
-            return;
-        }
-        IResourceDelta rootDelta = event.getDelta();
-
-        IPath webContentPath = J2EEUtils.getWebContentPath(ResourcesPlugin.getWorkspace().getRoot()
-                .getProject(projectName));
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-        }
-        
-        IResourceDelta webResourceDelta = rootDelta.findMember(webContentPath); //$NON-NLS-1$
-        if (webResourceDelta == null) {
-            return;
-        }
-
-        IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
-            public boolean visit(IResourceDelta delta) {
-                if (delta.getKind() != IResourceDelta.ADDED) {
-                    return true;
-                }
-                IResource resource = delta.getResource();
-                changedResources.add(resource);
-                return true;
-            }
-        };
-        try {
-            webResourceDelta.accept(visitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-    
-    public List<IResource> getChangedResources() {
-        return changedResources;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
deleted file mode 100644
index fb51dd8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CXFModelUtils.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.core.dom.rewrite.ImportRewrite;
-import org.eclipse.jdt.ui.CodeStyleConfiguration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.text.edits.TextEdit;
-import org.osgi.framework.Version;
-
-/**
- * Provides utility methods for working with the CXF model.
- * Also serving as an interim class to aid in refactoring core utilities into jaxws core.
- * 
- * @author sclarke
- *
- */
-public final class CXFModelUtils {
-    private static final Version v_0_0_0 = new Version("0.0.0");
-    private static final Version v_2_1 = new Version(CXFCorePlugin.CXF_VERSION_2_1);
-    private static final Version v_2_0_7 = new Version("2.0.7");
-    private static final Version v_2_1_1 = new Version("2.1.1");
-
-    public static final String WEB_SERVICE = "WebService"; //$NON-NLS-1$
-    public static final String WEB_METHOD = "WebMethod"; //$NON-NLS-1$
-    public static final String WEB_PARAM = "WebParam"; //$NON-NLS-1$
-    public static final String REQUEST_WRAPPER = "RequestWrapper"; //$NON-NLS-1$
-    public static final String RESPONSE_WRAPPER = "ResponseWrapper"; //$NON-NLS-1$
-
-    private static Map<String, String> ANNOTATION_TYPENAME_MAP = new HashMap<String, String>();
-
-    static {
-        ANNOTATION_TYPENAME_MAP.put("ServiceMode", "javax.xml.ws.ServiceMode"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebFault", "javax.xml.ws.WebFault"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(REQUEST_WRAPPER, "javax.xml.ws.RequestWrapper"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put(RESPONSE_WRAPPER, "javax.xml.ws.ResponseWrapper"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceClient", "javax.xml.ws.WebServiceClient"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebEndpoint", "javax.xml.ws.WebEndpoint"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceProvider", "javax.xml.ws.WebServiceProvider"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("BindingType", "javax.xml.ws.BindingType"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceRef", "javax.xml.ws.WebServiceRef"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("WebServiceRefs", "javax.xml.ws.WebServiceRefs"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(WEB_SERVICE, "javax.jws.WebService"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put(WEB_METHOD, "javax.jws.WebMethod"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put("Oneway", "javax.jws.OneWay"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put(WEB_PARAM, "javax.jws.WebParam"); //$NON-NLS-1$
-        ANNOTATION_TYPENAME_MAP.put("WebResult", "javax.jws.WebResult"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("SOAPBinding", "javax.jws.SOAPBinding"); //$NON-NLS-1$ //$NON-NLS-2$
-        ANNOTATION_TYPENAME_MAP.put("HandlerChain", "javax.jws.HandlerChain"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    private CXFModelUtils() {
-    }
-    
-    public static void getWebServiceAnnotationChange(IType type, Java2WSDataModel model, 
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-        
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-        
-        IAnnotationAttributeInitializer annotationAttributeInitializer = 
-            AnnotationsManager.getAnnotationDefinitionForClass(WebService.class).
-                getAnnotationAttributeInitializer();
-        
-        List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(type, ast,
-                WebService.class);
-        
-        if (model.isUseServiceEndpointInterface() && type.isClass()) {
-            MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                    "endpointInterface", model.getFullyQualifiedJavaInterfaceName());
-            memberValuePairs.add(1, endpointInterfaceValuePair);
-        }
-        
-        Annotation annotation = AnnotationsCore.createAnnotation(ast, WebService.class,
-                WebService.class.getSimpleName(), memberValuePairs);
-        
-        AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, source.findPrimaryType(),
-                annotation,  textFileChange);
-    }
-
-    public static void createMethodAnnotationChange(IType type, IMethod method, 
-            Class<? extends java.lang.annotation.Annotation> annotationClass, TextFileChange textFileChange) 
-                throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        Annotation annotation = getAnnotation(method, ast, annotationClass);
-
-        AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                annotation, textFileChange);
-    }
-
-    public static void getWebMethodAnnotationChange(IType type, IMethod method, 
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        Annotation annotation = getAnnotation(method, ast, WebMethod.class);
-
-        AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                annotation, textFileChange);
-    }
-    
-    public static void getRequestWrapperAnnotationChange(IType type, IMethod method, 
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        Annotation annotation = getAnnotation(method, ast, RequestWrapper.class);
-
-        AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method, 
-                annotation, textFileChange);
-    }
-
-    public static void getResponseWrapperAnnotationChange(IType type, IMethod method,
-            TextFileChange textFileChange) throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        Annotation annotation = getAnnotation(method, ast, ResponseWrapper.class);
-
-        AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method, 
-                annotation, textFileChange);
-    }
-    
-    public static void getWebParamAnnotationChange(IType type, final IMethod method, 
-            SingleVariableDeclaration parameter, TextFileChange textFileChange) 
-            throws CoreException {
-        ICompilationUnit source = type.getCompilationUnit();
-        CompilationUnit compilationUnit = AnnotationUtils.getASTParser(source);
-
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        Annotation annotation = getAnnotation(parameter, ast, WebParam.class);
-
-        AnnotationUtils.createMethodParameterAnnotationChange(source, compilationUnit, 
-                rewriter, parameter, method, annotation, textFileChange);
-    }
-    
-    private static Annotation getAnnotation(IJavaElement javaElement, AST ast, 
-                Class<? extends java.lang.annotation.Annotation> annotationClass) {
-        
-        IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager.
-            getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-        
-        List<MemberValuePair> memberValuePairs = 
-                annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
-        
-        return AnnotationsCore.createAnnotation(ast, annotationClass, annotationClass.getSimpleName(),
-                memberValuePairs);
-    }
-
-    private static Annotation getAnnotation(ASTNode astNode, AST ast, 
-                Class<? extends java.lang.annotation.Annotation> annotationClass) {
-        
-        IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager.
-            getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-        
-        List<MemberValuePair> memberValuePairs = annotationAttributeInitializer.getMemberValuePairs(astNode, 
-                ast, annotationClass);
-        
-        return AnnotationsCore.createAnnotation(ast, annotationClass, annotationClass.getSimpleName(),
-                memberValuePairs);
-    }
-    
-    public static void getImportsChange(ICompilationUnit compilationUnit, Java2WSDataModel model, 
-            TextFileChange textFileChange, boolean classOnly) {
-        try {
-        
-            ImportRewrite importRewrite = CodeStyleConfiguration.createImportRewrite(compilationUnit, true);
-            
-            importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(WEB_SERVICE));
-            
-            if (!classOnly) {
-                Map<IMethod, Map<String, Boolean>> methodAnnotationMap = model.getMethodMap();
-                Set<Entry<IMethod, Map<String, Boolean>>> methodAnnotationSet = methodAnnotationMap.entrySet();
-                for (Map.Entry<IMethod, Map<String, Boolean>> methodAnnotation : methodAnnotationSet) {
-                    Map<String, Boolean> methodMap = methodAnnotation.getValue();
-                    Set<Entry<String, Boolean>> methodSet = methodMap.entrySet();
-                    for (Map.Entry<String, Boolean> method : methodSet) {
-                        if (ANNOTATION_TYPENAME_MAP.containsKey(method.getKey()) && method.getValue()) {
-                            importRewrite.addImport(ANNOTATION_TYPENAME_MAP.get(method.getKey()));
-                        }
-                    }                    
-                }
-            }
-            if (importRewrite.hasRecordedChanges()) {
-                    TextEdit importTextEdit = importRewrite.rewriteImports(null);
-                    textFileChange.addEdit(importTextEdit);
-            }
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-
-    /**
-     * Loads all public methods with the default annotation maps
-     * @return
-     */
-    public static Map<IMethod, Map<String, Boolean>> getMethodMap(IType type, Java2WSDataModel model) {
-        Map<IMethod, Map<String, Boolean>> methodMap = new HashMap<IMethod, Map<String, Boolean>>();
-
-        try {
-            IMethod[] methods = type.getMethods();
-            for (IMethod method : methods) {
-                if (type.isInterface()) {
-                    methodMap.put(method, getAnnotationMap(model));                 
-                } else if (type.isClass() && JDTUtils.isPublicMethod(method)) {
-                    methodMap.put(method, getAnnotationMap(model));
-                }
-            }
-        } catch (JavaModelException jme) {
-            CXFCorePlugin.log(jme.getStatus());
-        }
-        return methodMap;
-    }
-    
-    public static Map<String, Boolean> getAnnotationMap(Java2WSDataModel model) {
-        Map<String, Boolean> annotationdMap = new HashMap<String, Boolean>();
-        annotationdMap.put(CXFModelUtils.WEB_METHOD, model.isGenerateWebMethodAnnotation());
-        annotationdMap.put(CXFModelUtils.WEB_PARAM, model.isGenerateWebParamAnnotation());
-        annotationdMap.put(CXFModelUtils.REQUEST_WRAPPER, model.isGenerateRequestWrapperAnnotation());
-        annotationdMap.put(CXFModelUtils.RESPONSE_WRAPPER, model.isGenerateResponseWrapperAnnotation());
-        return annotationdMap;
-    }
-    
-    /**
-     * CXF wsdl2java -autoNameResolution is supported in the CXF 2.0 stream from 2.0.7
-     * and in the CXF 2.1 stream from 2.1.1 up.
-     * 
-     * @param cxfRuntimeVersion
-     * @return
-     */
-    public static boolean isAutoNameResolutionPermitted() {
-        Version currentVersion = CXFCorePlugin.getDefault().getCurrentRuntimeVersion();
-        //On startup with clean workspace show by default.
-        if (currentVersion.compareTo(v_0_0_0) == 0) {
-            return true;
-        }
-
-        if (currentVersion.compareTo(CXFModelUtils.v_2_1_1) >= 0) {
-            return true;
-        }
-
-        if (currentVersion.compareTo(CXFModelUtils.v_2_0_7) >= 0
-                && currentVersion.compareTo(CXFModelUtils.v_2_1) < 0) {
-            return true;
-        }
-        return false;
-    }
-    
-    public static boolean getDefaultBooleanValue(int classifierID, int featureID) {
-        Object defaultValue = null;
-
-        if (classifierID == CXFPackage.CXF_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_ExportCXFClasspathContainer()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__VERBOSE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_Verbose().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_ANT_BUILD_FILE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_UseSpringApplicationContext()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_CLIENT:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateClient().getDefaultValue();
-                break;
-            case CXFPackage.CXF_CONTEXT__GENERATE_SERVER:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateServer().getDefaultValue();
-                break;
-            }
-        }
-
-        if (classifierID == CXFPackage.JAVA2_WS_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_AnnotationProcessingEnabled()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_Soap12Binding().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateXSDImports().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWSDL().getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebMethodAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateWebParamAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateRequestWrapperAnnotation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION:
-                defaultValue = CXFPackage.eINSTANCE.getJava2WSContext_GenerateResponseWrapperAnnotation()
-                        .getDefaultValue();
-                break;
-            }
-        }
-
-        if (classifierID == CXFPackage.WSDL2_JAVA_CONTEXT) {
-            switch (featureID) {
-            case CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_NoAddressBinding().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_UseDefaultValues().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_AutoNameResolution()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_GenerateImplementation()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_ANT_BUILD_FILE:
-                defaultValue = CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__VALIDATE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_Validate().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING:
-                defaultValue = CXFPackage.eINSTANCE
-                        .getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToString().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine()
-                        .getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringSimple().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcLocator().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcSyncMethods().getDefaultValue();
-                break;
-            case CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED:
-                defaultValue = CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated().getDefaultValue();
-                break;
-            }
-        }
-
-        if (defaultValue != null && defaultValue instanceof Boolean) {
-            return ((Boolean) defaultValue).booleanValue();
-        }
-
-        return false;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
deleted file mode 100644
index a017fab..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/CommandLineUtils.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public final class CommandLineUtils {
-    // Java2WSDL
-    private static String OUT_FILE = "-o"; //$NON-NLS-1$
-    private static String RESOURCE_DIR = "-d"; //$NON-NLS-1$
-    private static String SOURCE_DIR = "-s"; //$NON-NLS-1$
-    private static String CLASS_DIR = "-classdir"; //$NON-NLS-1$
-    private static String J2W_CLASSPATH = "-cp"; //$NON-NLS-1$
-    private static String INC_SOAP12 = "-soap12"; //$NON-NLS-1$
-    private static String TARGET_NAMESPACE = "-t"; //$NON-NLS-1$
-    private static String J2W_SERVICE_NAME = "-servicename"; //$NON-NLS-1$
-    private static String PORT_NAME = "-portname"; //$NON-NLS-1$
-    private static String GEN_XSD_IMPORTS = "-createxsdimports"; //$NON-NLS-1$
-    private static String VERBOSE = "-verbose"; //$NON-NLS-1$
-
-    // Java2WS
-    private static String J2W_FRONTEND = "-frontend"; //$NON-NLS-1$
-    private static String J2W_DATABINDING = "-databinding"; //$NON-NLS-1$
-    private static String BEAN_PATH = "-beans"; //$NON-NLS-1$
-    private static String GEN_WSDL = "-wsdl"; //$NON-NLS-1$
-    private static String GEN_CLIENT = "-client"; //$NON-NLS-1$
-    private static String GEN_SERVER = "-server"; //$NON-NLS-1$
-    private static String GEN_WRAPPER_FAULT = "-wrapperbean"; //$NON-NLS-1$
-
-    private static String W2J_PACKAGE_NAME = "-p"; //$NON-NLS-1$
-    private static String W2J_BINDING_NAME = "-b"; //$NON-NLS-1$
-
-    private static String W2J_FRONTEND = "-fe"; //$NON-NLS-1$
-    private static String W2J_DATABINDING = "-db"; //$NON-NLS-1$
-    private static String W2J_WSDL_VERSION = "-wv"; //$NON-NLS-1$
-    private static String W2J_SERVICE_NAME = "-sn"; //$NON-NLS-1$
-    private static String W2J_CATALOG = "-catalog"; //$NON-NLS-1$
-    private static String W2J_COMPILE = "-compile"; //$NON-NLS-1$
-    private static String W2J_GEN_IMPL = "-impl"; //$NON-NLS-1$
-    private static String W2J_GEN_ALL = "-all"; //$NON-NLS-1$
-    private static String W2J_NO_OVERWRITE = "-keep"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_VALUES = "-defaultValues"; //$NON-NLS-1$
-    private static String W2J_AUTO_NAME_RESOLUTION = "-autoNameResolution"; //$NON-NLS-1$
-    private static String W2J_EXCLUDE_NAMESPACE = "-nexclude"; //$NON-NLS-1$
-    private static String W2J_EXT_SOAP_HEADER = "-exsh"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_NAMESPACE = "-dns"; //$NON-NLS-1$
-    private static String W2J_DEFAULT_EXCLUDE_NS = "-dex"; //$NON-NLS-1$
-    private static String W2J_WSDL_LOCATION = "-wsdlLocation"; //$NON-NLS-1$
-    private static String W2J_XJC_ARGS = "-xjc"; //$NON-NLS-1$
-    private static String W2J_NO_ADDRESS_BINDING = "-noAddressBinding"; //$NON-NLS-1$
-    private static String W2J_VALIDATE_WSDL = "-validate"; //$NON-NLS-1$
-
-    // XJC
-    private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
-    private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
-    private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
-    private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
-    private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
-    private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
-    private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
-    private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
-    private CommandLineUtils() {
-    }
-    
-    public static String[] getJava2WSProgramArguments(Java2WSDataModel model) {
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(model.getProjectName());
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            String className = model.getJavaStartingPoint();
-            if (model.isUseServiceEndpointInterface() && model.getFullyQualifiedJavaClassName() != null) {
-                className = model.getFullyQualifiedJavaClassName();
-            }
-            // Add all the earlier wsdl2java tool options
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardJava2WSDLProgramArguments(model)));
-
-            if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-                progArgs.add(J2W_FRONTEND);
-                progArgs.add(model.getFrontend().getLiteral());
-
-                progArgs.add(J2W_DATABINDING);
-                progArgs.add(model.getDatabinding().getLiteral());
-
-                // progArgs.add(BEAN_PATH);
-                // progArgs.add("BEAN_PATH");
-
-                if (model.isGenerateWSDL()) {
-                    progArgs.add(GEN_WSDL);
-                } else {
-                    progArgs.remove(OUT_FILE);
-                    progArgs.remove(model.getWsdlFileName());
-                }
-
-                if (model.isGenerateClient()) {
-                    progArgs.add(GEN_CLIENT);
-                }
-                
-                if (model.isGenerateServer()) {
-                    progArgs.add(GEN_SERVER);
-                }
-
-                if (model.isGenerateWrapperFaultBeans()) {
-                    progArgs.add(GEN_WRAPPER_FAULT);
-                }
-            }
-
-            progArgs.add(className);
-        }
-        return (String[]) progArgs.toArray(new String[progArgs.size()]);
-    }
-    
-    private static String[] getStandardJava2WSDLProgramArguments(Java2WSDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-        progArgs.add(J2W_CLASSPATH);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName));
-
-        progArgs.add(SOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
-        progArgs.add(RESOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/wsdl"); //$NON-NLS-1$
-
-        progArgs.add(CLASS_DIR);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName));
-
-        progArgs.add(OUT_FILE);
-        progArgs.add(((Java2WSDataModel) model).getWsdlFileName());
-
-        if (model.isSoap12Binding()) {
-            progArgs.add(INC_SOAP12);
-        }
-        if (model.isGenerateXSDImports()) {
-            progArgs.add(GEN_XSD_IMPORTS);
-        }
-
-        if (model.isVerbose()) {
-            progArgs.add(VERBOSE);
-        }
-        
-        return (String[]) progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    public static String[] getWSDL2JavaProgramArguments(WSDL2JavaDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            // Add Standard args
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getStandardWSDL2JavaProgramArguments(model,
-                    projectName)));
-            
-            String serviceName = model.getServiceName();
-            if (serviceName != null && serviceName.length() > 0) {
-                progArgs.add(W2J_SERVICE_NAME);
-                progArgs.add(serviceName);
-            }
-            
-            if (model.isUseDefaultValues()) {
-                progArgs.add(W2J_DEFAULT_VALUES);
-            }
-            
-            if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-                progArgs.add(W2J_FRONTEND);
-                progArgs.add(model.getFrontend().getLiteral());
-
-                progArgs.add(W2J_DATABINDING);
-                progArgs.add(model.getDatabinding().getLiteral());
-
-                progArgs.add(W2J_WSDL_VERSION);
-                progArgs.add(model.getWsdlVersion());
-                
-                if (model.isNoAddressBinding()) {
-                    progArgs.add(W2J_NO_ADDRESS_BINDING);
-                }
-            }
-
-            progArgs.add(model.getWsdlURL().toExternalForm());
-        }
-        return (String[]) progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    public static String[] getWSDL2JavaGenerateClientArguments(WSDL2JavaDataModel model) {
-        String projectName = model.getProjectName();
-        List<String> progArgs = new ArrayList<String>();
-
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-        if (project != null && project.exists() && JDTUtils.isJavaProject(project)) {
-            progArgs.add(GEN_CLIENT);
-
-            // Add WSLD2Java args
-            progArgs.addAll(Arrays.asList(CommandLineUtils.getWSDL2JavaProgramArguments(model)));
-        }
-        return (String[]) progArgs.toArray(new String[progArgs.size()]);
-    }
-    
-    public static String[] getStandardWSDL2JavaProgramArguments(WSDL2JavaDataModel model, String projectName) {
-        List<String> progArgs = new ArrayList<String>();
-        progArgs.add(RESOURCE_DIR);
-        progArgs.add(FileUtils.getTmpFolder(projectName) + "/src"); //$NON-NLS-1$
-
-        progArgs.add(CLASS_DIR);
-        progArgs.add(JDTUtils.getJavaProjectOutputDirectoryPath(projectName));
-
-        Map<String, String> includedNamespaces = model.getIncludedNamespaces();
-        if (includedNamespaces != null && model.getIncludedNamespaces().size() > 0) {
-            Set<Map.Entry<String, String>> includedNamespacesEntrySet = includedNamespaces.entrySet();
-            for (Map.Entry<String, String> entry : includedNamespacesEntrySet) {
-                progArgs.add(W2J_PACKAGE_NAME);
-                String wsdlNamespace = entry.getKey();
-                String packageName = entry.getValue();
-                progArgs.add(wsdlNamespace + "=" + packageName); //$NON-NLS-1$
-            }
-        }
-
-        List<String> bindingFiles = model.getBindingFiles();
-        if (!bindingFiles.isEmpty()) {
-            for (String bindingFile : bindingFiles) {
-                progArgs.add(W2J_BINDING_NAME);
-                progArgs.add(bindingFile);
-            }
-        }
-        
-        if (model.isGenerateServer()) {
-            progArgs.add(GEN_SERVER);
-        }
-
-        if (model.isGenerateImplementation()) {
-            progArgs.add(W2J_GEN_IMPL);
-        }
-
-        if(model.isValidate()) {
-            progArgs.add(W2J_VALIDATE_WSDL);
-        }
-        
-        progArgs.add(W2J_EXT_SOAP_HEADER);
-        progArgs.add(Boolean.toString(model.isProcessSOAPHeaders()));
-        
-        progArgs.add(W2J_DEFAULT_NAMESPACE);
-        progArgs.add(Boolean.toString(model.isLoadDefaultNamespacePackageNameMapping()));
-        
-        progArgs.add(W2J_DEFAULT_EXCLUDE_NS);
-        progArgs.add(Boolean.toString(model.isLoadDefaultExcludesNamepsaceMapping()));
-
-        if (model.isAutoNameResolution() && CXFModelUtils.isAutoNameResolutionPermitted()) {
-            progArgs.add(W2J_AUTO_NAME_RESOLUTION);
-        }
-
-        String xjcArgs = CommandLineUtils.getXJCArgs(model);
-        if (xjcArgs.trim().length() > 0) {
-            progArgs.add(W2J_XJC_ARGS + xjcArgs);
-        }
-
-        if (model.getWsdlLocation() != null) {
-            progArgs.add(W2J_WSDL_LOCATION);
-            progArgs.add(model.getWsdlLocation());
-        }
-        
-        if (model.isVerbose()) {
-            progArgs.add(VERBOSE);
-        }
-        return (String[]) progArgs.toArray(new String[progArgs.size()]);
-    }
-
-    private static String getXJCArgs(WSDL2JavaDataModel model) {
-        List<String> xjcArgs = new ArrayList<String>();
-        if (model.isXjcUseDefaultValues()) {
-            xjcArgs.add(XJC_DV_ARG);
-        }
-        if (model.isXjcToString()) {
-            xjcArgs.add(XJC_TS_ARG);
-        }
-        if (model.isXjcToStringMultiLine()) {
-            xjcArgs.add(XJC_TS_MULTI_ARG);
-        }
-        if (model.isXjcToStringSimple()) {
-            xjcArgs.add(XJC_TS_SIMPLE);
-        }
-        if (model.isXjcLocator()) {
-            xjcArgs.add(XJC_LOCATOR_ARG);
-        }
-        if (model.isXjcSyncMethods()) {
-            xjcArgs.add(XJC_SYNC_METHODS_ARG);
-        }
-        if (model.isXjcMarkGenerated()) {
-            xjcArgs.add(XJC_MARK_GENERATED_ARG);
-        }
-
-        String xjcArg = xjcArgs.toString();
-        xjcArg = xjcArg.replace('[', ' ');        
-        xjcArg = xjcArg.replace(']', ' ');
-        
-        xjcArg = xjcArg.replaceAll("\\s", ""); //$NON-NLS-1$ //$NON-NLS-2$
-        
-        return xjcArg.trim();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
deleted file mode 100644
index ef42d64..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/FileUtils.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.ui.internal.FormatProcessorsExtensionReader;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public final class FileUtils {
-
-    private static final String TMP_FOLDER_NAME = ".cxftmp"; //$NON-NLS-1$
-
-    private FileUtils() {
-    }
-
-    public static IProject getProject(String projectName) {
-        return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    }
-    
-    public static void copyFolder(String source, String destination) {
-        File sourceFolder = new File(source);
-
-        String[] files = sourceFolder.list();
-        for (int i = 0; i < files.length; i++) {
-            File file = new File(sourceFolder + File.separator + files[i]);
-            if (file.isDirectory()) {
-                copyFolder(source, destination, files[i]);
-            } else {
-                copyFile(source, destination, files[i]);
-            }
-        }
-    }
-
-    private static void copyFolder(String sourceFolder, String targetFolder, String name) {
-        File target = new File(targetFolder + File.separator + name);
-        if (!target.exists()) {
-            target.mkdir();
-        }
-        copyFolder(sourceFolder + File.separator + name, targetFolder + File.separator + name);
-    }
-
-    public static void copyFile(String sourceFolder, String targetFolder, String fileName) {
-        File sourceFile = new File(sourceFolder + File.separator + fileName);
-        File targetFile = new File(targetFolder + File.separator + fileName);
-        if (!targetFile.exists()) {
-        	InputStream inputStream = null;
-            OutputStream outputStream = null;
-            try {
-		        inputStream = new FileInputStream(sourceFile);
-                outputStream = new FileOutputStream(targetFile);
-                byte[] buffer = new byte[102400];
-                while (true) {
-                    int numberOfBytes = inputStream.read(buffer);
-                    if (numberOfBytes < 0) {
-                        break;
-                    }
-                    outputStream.write(buffer, 0, numberOfBytes);
-                }
-
-            } catch (FileNotFoundException fnfe) {
-                CXFCorePlugin.log(fnfe);
-		    } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-			} finally {
-				try {
-				    if (inputStream != null) {
-				        inputStream.close();    
-				    }
-				    if (outputStream != null) {
-				        outputStream.close();    
-				    }
-				} catch(IOException ioe) {
-                    CXFCorePlugin.log(ioe);
-				}
-			}
-        } else {
-            if (sourceFile.getName().indexOf(".java") != -1) { //$NON-NLS-1$
-                MergeUtils.merge(sourceFile, targetFile);
-            }
-        }
-    }
-
-    public static String getTmpFolderName() {
-        return TMP_FOLDER_NAME;
-    }
-    
-    public static String getTmpFolder(String projectName) {
-        return FileUtils.getTmpFolder(FileUtils.getProject(projectName));
-    }
-
-    public static String getTmpFolder(IProject project) {
-        IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
-        if (!tmpFolder.exists()) {
-            try {
-                tmpFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        
-        IFolder tmpSrcFolder = tmpFolder.getFolder("src"); //$NON-NLS-1$
-        if (!tmpSrcFolder.exists()) {
-            try {
-                tmpSrcFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        
-        IFolder tmpWSDLFolder = tmpFolder.getFolder("wsdl"); //$NON-NLS-1$
-        if (!tmpWSDLFolder.exists()) {
-            try {
-                tmpWSDLFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        return tmpFolder.getLocation().toOSString();
-    }
-
-    public static void copyW2JFilesFromTmp(WSDL2JavaDataModel model) {
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-
-        IProject project = workspaceRoot.getProject(model.getProjectName());
-        IFolder srcFolder = workspaceRoot.getFolder(new Path(model.getJavaSourceFolder()));
-        FileUtils.copyFolder(getTmpFolder(project) + "/src", srcFolder.getLocation().toOSString()); //$NON-NLS-1$
-
-        try {
-            srcFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-        deleteTmpFolder(project);
-    }
-
-    public static void copyJ2WFilesFromTmp(Java2WSDataModel model) {
-        String projectName = model.getProjectName();
-        IProject project = FileUtils.getProject(projectName);
-
-        IType type = JDTUtils.getType(JDTUtils.getJavaProject(projectName), model.getJavaStartingPoint());
-        IJavaElement javaElement = type.getPackageFragment().getParent();
-        IResource javaElementResource = javaElement.getResource();
-        if (javaElementResource instanceof IFolder) {
-            try {
-                IFolder srcDirectory = (IFolder) javaElementResource;
-                FileUtils.copyFolder(getTmpFolder(project) + "/src", srcDirectory.getLocation().toOSString()); //$NON-NLS-1$
-                srcDirectory.refreshLocal(IResource.DEPTH_INFINITE,  new NullProgressMonitor());
-                
-                if (model.isGenerateWSDL()) {
-                    IFolder wsdlFolder = WSDLUtils.getWSDLFolder(projectName);
-                    FileUtils.copyFolder(getTmpFolder(project) + "/wsdl", wsdlFolder.getLocation() //$NON-NLS-1$
-                            .toOSString());
-                    model.setConfigWsdlLocation(wsdlFolder.getName() + "/"  //$NON-NLS-1$
-                            + model.getWsdlFileName());
-                    wsdlFolder.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-                }
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-
-        }
-        deleteTmpFolder(project);
-    }
-
-    private static IStatus deleteTmpFolder(IProject project) {
-        IStatus status = Status.OK_STATUS;
-
-        IFolder tmpFolder = project.getFolder(TMP_FOLDER_NAME);
-        if (tmpFolder.exists()) {
-            try {
-                tmpFolder.delete(true, false, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            }
-        }
-        return status;
-    }
-
-    public static boolean isFileInWebContentFolder(IProject project, IPath filePath) {
-    	IPath webContentPath = WSDLUtils.getWebContentFolder(project).getLocation();
-    	if (webContentPath.isPrefixOf(filePath)) {
-       		return true;
-    	}
-    	return false;
-    }
-    
-    public static boolean isFileInWorkspace(URL fileURL) {
-        IPath filePath = new Path(fileURL.getPath());
-
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        IPath workspacePath = workspaceRoot.getLocation();
-        if (filePath.isValidPath(workspacePath.toOSString())) {
-        	return true;
-        }
-        return false;
-    }
-
-    public static void formatXMLFile(IFile file) {
-        if (file != null) {
-            try {
-                IContentDescription contentDescription = file.getContentDescription();
-                if (contentDescription == null) {
-                    return;
-                }
-                IContentType contentType = contentDescription.getContentType();
-                IStructuredFormatProcessor formatProcessor = FormatProcessorsExtensionReader.getInstance()
-                        .getFormatProcessor(contentType.getId());
-                if (formatProcessor != null) {
-                    formatProcessor.formatFile(file);
-                }
-            } catch (CoreException ce) {
-                CXFCorePlugin.log(ce.getStatus());
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-    
-    public static void refreshProject(String projectName, IProgressMonitor monitor) {
-        IProject project = FileUtils.getProject(projectName);
-        FileUtils.refreshProject(project, monitor);
-    }
-
-    public static void refreshProject(IProject project, IProgressMonitor monitor) {
-        try {
-            project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.java
deleted file mode 100644
index 5047902..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/LaunchUtils.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.utils;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.Launch;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.console.IConsoleManager;
-import org.eclipse.ui.console.IConsoleView;
-import org.eclipse.ui.console.IOConsoleOutputStream;
-import org.eclipse.ui.console.MessageConsole;
-
-/**
- * @author sclarke
- */
-public final class LaunchUtils {
-    //private static final String MESSAGE_CONSOLE_NAME = "CXF";
-    
-    private LaunchUtils() {
-    }
-
-    public static IStatus launch(String[] runtimeClasspath, String className, String[] programArgs) {
-        IStatus status = Status.OK_STATUS;
-        try {
-            IVMInstall vmInstall = JavaRuntime.getDefaultVMInstall();
-            IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
-            VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className,
-                    runtimeClasspath);
-            vmRunnerConfiguration.setProgramArguments(programArgs);
-
-            ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
-            vmRunner.run(vmRunnerConfiguration, launch, null);
-
-            while (!launch.isTerminated()) {
-                try {
-                    Thread.sleep(100);
-                } catch (InterruptedException ie) {
-                    CXFCorePlugin.log(ie);
-                }
-            }
-
-            IProcess[] processes = launch.getProcesses();
-            String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
-            if (outputStream != null && outputStream.length() > 0) {
-                status = new Status(IStatus.INFO, CXFCorePlugin.PLUGIN_ID, outputStream);
-            }
-
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce);
-        }
-        return status;
-    }
-
-    public static void launch(IJavaProject javaProject, String className, String[] programArgs)
-            throws CoreException {
-        IVMInstall vmInstall = JavaRuntime.getVMInstall(javaProject);
-        if (vmInstall == null) {
-            vmInstall = JavaRuntime.getDefaultVMInstall();
-        }
-
-        IVMRunner vmRunner = vmInstall.getVMRunner(ILaunchManager.RUN_MODE);
-        String[] runtimeClasspath = JavaRuntime.computeDefaultRuntimeClassPath(javaProject);
-        VMRunnerConfiguration vmRunnerConfiguration = new VMRunnerConfiguration(className, runtimeClasspath);
-
-        vmRunnerConfiguration.setProgramArguments(programArgs);
-
-        if (vmInstall instanceof IVMInstall2) {
-            IVMInstall2 install2 = (IVMInstall2) vmInstall;
-            if (install2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
-                vmRunnerConfiguration.setVMArguments(new String[] { "-Djava.endorsed.dirs="
-                        + CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation() });
-            }
-        }
-
-        ILaunch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
-        vmRunner.run(vmRunnerConfiguration, launch, null);
-
-        while (!launch.isTerminated()) {
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ie) {
-                CXFCorePlugin.log(ie);
-            }
-        }
-
-        IProcess[] processes = launch.getProcesses();
-
-        String outputStream = processes[0].getStreamsProxy().getOutputStreamMonitor().getContents();
-        logStream(outputStream);
-        String errorStream = processes[0].getStreamsProxy().getErrorStreamMonitor().getContents();
-        logStream(errorStream);
-      
-        logErrorStreamContents(errorStream, className);
-    }
-
-    private static void logStream(String outputStream) {
-        try {
-            MessageConsole cxfConsole = getCXFConsole();
-            IWorkbench workbench = PlatformUI.getWorkbench();
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-            if (workbenchWindow != null) {
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                String console_view_id = IConsoleConstants.ID_CONSOLE_VIEW;
-                IConsoleView consoleView = (IConsoleView) workbenchPage.showView(console_view_id);
-                consoleView.display(cxfConsole);
-                IOConsoleOutputStream consoleOutputStream = cxfConsole.newOutputStream();
-                consoleOutputStream.write(outputStream);
-                consoleOutputStream.close();
-            }
-        } catch (PartInitException pie) {
-            CXFCorePlugin.log(pie);
-        } catch (IOException ioe) {
-            CXFCorePlugin.log(ioe);
-        }
-    }
-
-    private static MessageConsole getCXFConsole() {
-        ConsolePlugin consolePlugin = ConsolePlugin.getDefault();
-        IConsoleManager consoleManager = consolePlugin.getConsoleManager();
-        IConsole[] existingConsoles = consoleManager.getConsoles();
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        for (int i = 0; i < existingConsoles.length; i++) {
-           if (existingConsoles[i].getName().equals(context.getCxfRuntimeEdition() + " " 
-                   + context.getCxfRuntimeVersion())) {
-               return (MessageConsole) existingConsoles[i]; 
-           }
-        }
-        MessageConsole cxfConsole = new MessageConsole(context.getCxfRuntimeEdition() + " " 
-                + context.getCxfRuntimeVersion(),
-                CXFCorePlugin.imageDescriptorFromPlugin(CXFCorePlugin.PLUGIN_ID, 
-                        "icons/view16/console_view.gif")); //$NON-NLS-1$
-        consoleManager.addConsoles(new IConsole[]{cxfConsole});
-        return cxfConsole;
-     }
-
-    private static void logErrorStreamContents(String message, String className) {
-    	String toolName = className.substring(className.lastIndexOf(".") + 1,  //$NON-NLS-1$
-                className.length());
-
-        if (message != null && message.indexOf(toolName + " Error") != -1) { //$NON-NLS-1$
-          Status toolStatus = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, message);
-          CXFCorePlugin.log(toolStatus);
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
deleted file mode 100644
index 75a3040..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/MergeUtils.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.merge.java.JMerger;
-import org.eclipse.emf.codegen.merge.java.facade.FacadeHelper;
-import org.eclipse.emf.codegen.merge.java.facade.JCompilationUnit;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-
-/**
- * @author sclarke
- */
-public final class MergeUtils {
-
-    private MergeUtils() {
-        
-    }
-    
-    private static JMerger getJMerger() {
-        FacadeHelper facadeHelper = CodeGenUtil.instantiateFacadeHelper(JMerger.DEFAULT_FACADE_HELPER_CLASS);
-        URL mergeFileURL = FileLocator.find(CXFCorePlugin.getDefault().getBundle(), new Path(
-                "/jmerger/merge.xml"), null); //$NON-NLS-1$
-        JControlModel controlModel = new JControlModel();
-        controlModel.initialize(facadeHelper, mergeFileURL.toString());
-        JMerger jmerger = new JMerger(controlModel);
-
-        return jmerger;
-    }
-
-    public static void merge(File sourceFile, File targetFile) {
-        JMerger merger = getJMerger();
-
-        FileInputStream sourceInputStream = null;
-        FileInputStream targetInputStream = null;
-        OutputStream targetOutputStream = null;
-        try {
-            // set source
-            sourceInputStream = new FileInputStream(sourceFile);
-            JCompilationUnit inputCompilationUnit = merger
-                    .createCompilationUnitForInputStream(sourceInputStream);
-            merger.setSourceCompilationUnit(inputCompilationUnit);
-
-            // set target
-            targetInputStream = new FileInputStream(targetFile);
-            JCompilationUnit targetCompilationUnit = merger
-                    .createCompilationUnitForInputStream(targetInputStream);
-            merger.setTargetCompilationUnit(targetCompilationUnit);
-
-            // merge source and target
-            merger.merge();
-
-            // write merged contents
-            targetOutputStream = new FileOutputStream(targetFile);
-            byte[] bytes = merger.getTargetCompilationUnit().getContents().getBytes();
-            targetOutputStream.write(bytes, 0, bytes.length);
-        } catch (FileNotFoundException fnfe) {
-            CXFCorePlugin.log(fnfe);
-        } catch (IOException ioe) {
-            CXFCorePlugin.log(ioe);
-        } finally {
-            try {
-                if (sourceInputStream != null) {
-                    sourceInputStream.close();
-                }
-                if (targetInputStream != null) {
-                    targetInputStream.close();
-                }
-                if (targetOutputStream != null) {
-                    targetOutputStream.close();
-                }
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
deleted file mode 100644
index 106d1a2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/utils/SpringUtils.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public final class SpringUtils {
-    private static Namespace SPRING_BEANS_NS = Namespace
-            .getNamespace("http://www.springframework.org/schema/beans"); //$NON-NLS-1$
-    private static Namespace XMLNS_XSI = Namespace.getNamespace("xsi", //$NON-NLS-1$
-            "http://www.w3.org/2001/XMLSchema-instance"); //$NON-NLS-1$
-    private static Namespace JAXWS_NS = Namespace.getNamespace("jaxws", "http://cxf.apache.org/jaxws"); //$NON-NLS-1$ //$NON-NLS-2$
-    private static Namespace SOAP_NS = Namespace.getNamespace("soap", "http://cxf.apache.org/bindings/soap"); //$NON-NLS-1$ //$NON-NLS-2$
-
-    private static String DOC_ROOT = "beans"; //$NON-NLS-1$
-
-    private SpringUtils() {
-    }
-
-    public static IFile getBeansFile(IProject project) throws IOException {
-        IFile beansFile = null;
-        IPath webContentPath = J2EEUtils.getWebContentPath(project);
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-
-            IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
-            IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
-            beansFile = webINFFolder.getFile("beans.xml"); //$NON-NLS-1$
-            if (!beansFile.exists()) {
-                try {
-                    IProgressMonitor progressMonitor = new NullProgressMonitor();
-                    beansFile.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-                    createBaseBeansFile(beansFile);
-                } catch (CoreException ce) {
-                    CXFCorePlugin.log(ce);
-                }
-            }
-        }
-        return beansFile;
-    }
-
-    public static IFile getBeansFile(String projectName) throws IOException {
-        return SpringUtils.getBeansFile(FileUtils.getProject(projectName));
-    }
-
-    /**
-     * Returns a handle to the cxf-servlet file in the Web projects WEB-INF
-     * folder.
-     * 
-     * @param project
-     * @return {@link IFile}
-     */
-    public static IFile getCXFServlet(IProject project) throws IOException {
-        IFile cxfServlet = null;
-        IPath webContentPath = J2EEUtils.getWebContentPath(project);
-        if (!webContentPath.hasTrailingSeparator()) {
-            webContentPath = webContentPath.addTrailingSeparator();
-
-            IPath webINFPath = webContentPath.append(new Path("WEB-INF/")); //$NON-NLS-1$
-            IFolder webINFFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(webINFPath);
-            cxfServlet = webINFFolder.getFile("cxf-servlet.xml"); //$NON-NLS-1$
-            if (!cxfServlet.exists()) {
-                try {
-                    IProgressMonitor progressMonitor = new NullProgressMonitor();
-
-                    cxfServlet.create(new ByteArrayInputStream(new byte[] {}), true, progressMonitor);
-                    createBaseCXFServletFile(cxfServlet);
-                } catch (CoreException ce) {
-                    CXFCorePlugin.log(ce.getStatus());
-                }
-            }
-        }
-        return cxfServlet;
-    }
-
-    public static IFile getCXFServlet(String projectName) throws IOException {
-        return SpringUtils.getCXFServlet(FileUtils.getProject(projectName));
-    }
-
-    private static void createBaseCXFServletFile(IFile cxfServlet)  throws IOException {
-        Element beans = new Element(DOC_ROOT);
-        beans.setNamespace(SPRING_BEANS_NS);
-        beans.addNamespaceDeclaration(XMLNS_XSI);
-        beans.addNamespaceDeclaration(JAXWS_NS);
-        beans.addNamespaceDeclaration(SOAP_NS);
-
-        Attribute schemaLocation = new Attribute(
-                "schemaLocation", //$NON-NLS-1$
-                "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/bindings/soap http://cxf.apache.org/schemas/configuration/soap.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
-        beans.setAttribute(schemaLocation);
-
-        writeConfig(new Document(beans), cxfServlet);
-    }
-
-    private static void createBaseBeansFile(IFile beansFile) throws IOException {
-        Element beans = new Element(DOC_ROOT);
-        beans.setNamespace(SPRING_BEANS_NS);
-        beans.addNamespaceDeclaration(XMLNS_XSI);
-        beans.addNamespaceDeclaration(JAXWS_NS);
-
-        Attribute schemaLocation = new Attribute(
-                "schemaLocation", //$NON-NLS-1$
-                "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd " //$NON-NLS-1$
-                        + "http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd", XMLNS_XSI); //$NON-NLS-1$
-
-        beans.setAttribute(schemaLocation);
-
-        Element importCXFResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFResource.setAttribute("resource", "classpath:META-INF/cxf/cxf.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        Element importCXFSoapExtensionResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFSoapExtensionResource.setAttribute("resource", //$NON-NLS-1$
-                "classpath:META-INF/cxf/cxf-extension-soap.xml"); //$NON-NLS-1$
-
-        Element importCXFServeltResource = new Element("import", SPRING_BEANS_NS); //$NON-NLS-1$
-        importCXFServeltResource.setAttribute("resource", "classpath:META-INF/cxf/cxf-servlet.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-
-        beans.addContent(importCXFResource);
-        beans.addContent(importCXFSoapExtensionResource);
-        beans.addContent(importCXFServeltResource);
-
-        writeConfig(new Document(beans), beansFile);
-    }
-
-    public static boolean isSpringBeansFile(IFile springBeansFile) throws IOException {
-        FileInputStream springBeansInputStream = new FileInputStream(springBeansFile.getLocation().toFile());
-        if (springBeansInputStream.available() > 0) {
-            SAXBuilder builder = new SAXBuilder();
-            try {
-                Document doc = builder.build(springBeansInputStream);
-                Element root = doc.getRootElement();
-                if (root.getName().equals(DOC_ROOT) && root.getNamespace().equals(SPRING_BEANS_NS)) {
-                    return true;
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-               springBeansInputStream.close();
-            }
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static boolean isBeanDefined(CXFDataModel cxfDataModel, String projectName, String elementName,
-            Namespace namespace, String id) throws IOException {
-        IFile springConfigFile = null;
-        
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(projectName);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(projectName);
-        }
-
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-
-                List<Element> endpoints = beans.getChildren(elementName, namespace);
-                for (Element element : endpoints) {
-                    if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
-                        Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
-                        if (idAttribute.getValue().equals(id)) {
-                            return true;
-                        }
-                    }                    
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-               springConfigInputSteam.close();
-            }
-        }
-        return false;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static String getEndpointAddress(IProject project, String jaxwsEndpointId) throws IOException {
-        IFile springConfigFile = null;
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(project);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(project);
-        }
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-                List<Element> endpoints = beans.getChildren("endpoint", JAXWS_NS); //$NON-NLS-1$
-                for (Element element : endpoints) {
-                    if (element != null && element.getAttribute("id") != null) { //$NON-NLS-1$
-                        Attribute idAttribute = element.getAttribute("id"); //$NON-NLS-1$
-                        if (idAttribute.getValue().equals(jaxwsEndpointId)) {
-                           return element.getAttribute("address").getValue(); //$NON-NLS-1$
-                        }
-                    }                    
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-                springConfigInputSteam.close();
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void createConfigurationFromWSDL(WSDL2JavaDataModel model) throws IOException {
-        String targetNamespace = model.getTargetNamespace();
-        String packageName = model.getIncludedNamespaces().get(targetNamespace);
-
-        Definition definition = model.getWsdlDefinition();
-        Map servicesMap = definition.getServices();
-        Set<Map.Entry> servicesSet = servicesMap.entrySet();
-        for (Map.Entry serviceEntry : servicesSet) {
-            Service service = (Service) serviceEntry.getValue();
-            model.setServiceName(service.getQName().getLocalPart());
-            Map portsMap = service.getPorts();
-            Set<Map.Entry> portsSet = portsMap.entrySet();
-            for (Map.Entry portEntry : portsSet) {
-                Port port = (Port) portEntry.getValue();
-                model.setEndpointName(port.getName());
-                PortType portType = port.getBinding().getPortType();
-                QName qName = portType.getQName();
-                String portTypeName = qName.getLocalPart();
-                String fullyQualifiedClassName = packageName + "." + //$NON-NLS-1$
-                	convertPortTypeName(portTypeName) + "Impl"; //$NON-NLS-1$
-                model.setFullyQualifiedJavaClassName(fullyQualifiedClassName);
-                SpringUtils.createJAXWSEndpoint(model);
-             }
-         }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static void loadSpringConfigInformationFromWSDL(CXFDataModel model) {
-        IFile wsdlFile = WSDLUtils.getWSDLFolder(model.getProjectName()).getFile(model.getWsdlFileName());
-        if (wsdlFile.exists()) {
-            try {
-                model.setWsdlURL(wsdlFile.getLocationURI().toURL());
-                Definition definition = WSDLUtils.readWSDL(model.getWsdlURL());
-                Map servicesMap = definition.getServices();
-                Set<Map.Entry> servicesSet = servicesMap.entrySet();
-                for (Map.Entry serviceEntry : servicesSet) {
-                    Service service = (Service) serviceEntry.getValue();
-                    model.setServiceName(service.getQName().getLocalPart());
-                    Map portsMap = service.getPorts();
-                    Set<Map.Entry> portsSet = portsMap.entrySet();
-                    for (Map.Entry portEntry : portsSet) {
-                        Port port = (Port) portEntry.getValue();
-                        model.setEndpointName(port.getName());
-                     }
-                }
-                model.setWsdlDefinition(definition);
-            } catch (MalformedURLException murle) {
-               CXFCorePlugin.log(murle);
-            } catch (IOException ioe) {
-                CXFCorePlugin.log(ioe);
-            }
-        }
-    }
-
-    private static String convertPortTypeName(String portTypeName) {
-        String[] segments = portTypeName.split("[\\-\\.\\:\\_\\u00b7\\u0387\\u06dd\\u06de]");
-
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String segment : segments) {
-            if (segment.length() == 0) {
-                continue;
-            }
-            char firstCharacter = segment.charAt(0);
-            if (!Character.isDigit(firstCharacter) && Character.isLowerCase(firstCharacter)) {
-                segment = segment.substring(0, 1).toUpperCase() + segment.substring(1);
-            }
-
-            for (int i = 1; i < segment.length(); i++) {
-                char currentChar = segment.charAt(i);
-                char precedingChar = segment.charAt(i - 1);
-                if (Character.isLetter(currentChar) && Character.isDigit(precedingChar)
-                        && Character.isLowerCase(currentChar)) {
-                    segment = segment.substring(0, i) + segment.substring(i, i + 1).toUpperCase()
-                            + segment.substring(i + 1, segment.length());
-                }
-            }
-            stringBuilder.append(segment);
-        }
-        return stringBuilder.toString();
-    }
-
-    public static void createJAXWSEndpoint(CXFDataModel model) throws IOException {
-        String projectName = model.getProjectName();
-
-        IFile springConfigFile = null;
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isUseSpringApplicationContext()) {
-            springConfigFile = SpringUtils.getBeansFile(projectName);
-        } else {
-            springConfigFile = SpringUtils.getCXFServlet(projectName);
-        }
-
-        if (isSpringBeansFile(springConfigFile)) {
-            SAXBuilder builder = new SAXBuilder();
-            FileInputStream springConfigInputSteam = new FileInputStream(springConfigFile.getLocation()
-                    .toFile());
-            try {
-                Document doc = builder.build(springConfigInputSteam);
-                Element beans = doc.getRootElement();
-
-                Element jaxwsEndpoint = new Element("endpoint", JAXWS_NS); //$NON-NLS-1$
-
-                String id = getJAXWSEndpointID(model);
-                model.setConfigId(id);
-                jaxwsEndpoint.setAttribute("id", id); //$NON-NLS-1$
-
-                jaxwsEndpoint.setAttribute("implementor", model.getFullyQualifiedJavaClassName()); //$NON-NLS-1$
-
-                if (model.getConfigWsdlLocation() != null) {
-                    jaxwsEndpoint.setAttribute("wsdlLocation", model.getConfigWsdlLocation()); //$NON-NLS-1$
-                    
-                    if (model.getEndpointName() != null && model.getServiceName() != null) {
-                        jaxwsEndpoint.setAttribute("endpointName", "tns:" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
-                        jaxwsEndpoint.setAttribute("serviceName", "tns:" + model.getServiceName()); //$NON-NLS-1$ //$NON-NLS-2$
-                    
-                        Namespace XMLNS_TNS = Namespace.getNamespace("tns", model.getTargetNamespace()); //$NON-NLS-1$
-                        jaxwsEndpoint.addNamespaceDeclaration(XMLNS_TNS);
-                    }
-                }
-                
-                if (model.getEndpointName() != null) {
-                    jaxwsEndpoint.setAttribute("address", "/" + model.getEndpointName()); //$NON-NLS-1$ //$NON-NLS-2$
-                } else {
-                    jaxwsEndpoint.setAttribute("address", "/" + id); //$NON-NLS-1$ //$NON-NLS-2$
-                }
-                
-
-                Element jaxwsFeatures = new Element("features", JAXWS_NS); //$NON-NLS-1$
-                Element bean = new Element("bean", SPRING_BEANS_NS); //$NON-NLS-1$
-                bean.setAttribute("class", "org.apache.cxf.feature.LoggingFeature"); //$NON-NLS-1$ //$NON-NLS-2$
-                jaxwsFeatures.addContent(bean);
-                jaxwsEndpoint.addContent(jaxwsFeatures);
-
-                if (!isBeanDefined(model, projectName, "endpoint", JAXWS_NS, id)) { //$NON-NLS-1$
-                    beans.addContent(jaxwsEndpoint);
-
-                    writeConfig(doc, springConfigFile);
-                }
-            } catch (JDOMException jdome) {
-                CXFCorePlugin.log(jdome);
-            } finally {
-                springConfigInputSteam.close();
-            }
-        }
-    }
-
-    private static String getJAXWSEndpointID(CXFDataModel model) {
-        String implementor = model.getFullyQualifiedJavaClassName();
-        if (implementor.indexOf(".") != -1) { //$NON-NLS-1$
-            implementor = implementor.substring(implementor.lastIndexOf(".") + 1, implementor.length());
-        }
-        if (!implementor.startsWith("Impl") && implementor.indexOf("Impl") != -1) {
-            implementor = implementor.substring(0, implementor.indexOf("Impl")).toLowerCase(); //$NON-NLS-1$;
-        } else {
-            implementor = implementor.toLowerCase();
-        }
-        return implementor;
-    }
-    
-    private static void writeConfig(Document document, IFile springConfigFile) throws IOException {
-        OutputStream outputStream = new FileOutputStream(springConfigFile.getLocation().toFile());
-        try {
-            XMLOutputter outputter = new XMLOutputter();
-            outputter.output(document, outputStream);
-            springConfigFile.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
-            FileUtils.formatXMLFile(springConfigFile);
-        } catch (CoreException ce) {
-            CXFCorePlugin.log(ce.getStatus());
-        } finally {
-            outputStream.close(); 
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
deleted file mode 100644
index 6430265..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetInstallDelegate.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.facet;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.SessionConfig;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCoreMessages;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * Copies the contents of the cxf lib folder from the cxf home directory into
- * the WEB-INF/lib in the web projects WebContent directory.
- * <p>
- * Also sets up the web projects application deployment descriptor (web.xml file)
- * to use cxf-servlet or the Spring Application context (WEB-INF/beans.xml) for 
- * endpoint configuration. Depends on a setting in the CXF preferences. 
- * 
- * @author sclarke
- */
-public class CXFFacetInstallDelegate implements IDelegate {
-
-    public void execute(final IProject project, IProjectFacetVersion fv, Object config,
-            IProgressMonitor monitor) throws CoreException {
-
-        if (CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation().equals("")) { //$NON-NLS-1$
-            throw new CoreException(new Status(Status.ERROR, CXFCorePlugin.PLUGIN_ID,
-                    CXFCoreMessages.CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET));
-        }
-
-        IPath cxfLibPath = new Path(CXFCorePlugin.getDefault().getJava2WSContext().getCxfRuntimeLocation());
-        if (!cxfLibPath.hasTrailingSeparator()) {
-            cxfLibPath = cxfLibPath.addTrailingSeparator();
-        }
-        cxfLibPath = cxfLibPath.append("lib"); //$NON-NLS-1$
-
-        IClasspathAttribute jstComponentDependency = 
-            JavaCore.newClasspathAttribute("org.eclipse.jst.component.dependency", "/WEB-INF/lib"); //$NON-NLS-1$
-        IClasspathEntry cxfClasspathContainer = 
-            JavaCore.newContainerEntry(new Path("org.eclipse.jst.ws.cxf.core.CXF_CLASSPATH_CONTAINER"), //$NON-NLS-1$
-            new IAccessRule[0],
-            CXFCorePlugin.getDefault().getJava2WSContext().isExportCXFClasspathContainer() 
-            ? new IClasspathAttribute[]{jstComponentDependency} : new IClasspathAttribute[]{},
-            true);
-        
-        JDTUtils.addToClasspath(JavaCore.create(project), cxfClasspathContainer);
-        
-        // Add CXF Servlet, Servlet Mapping and Session Config to web.xml
-        final IModelProvider provider = ModelProviderManager.getModelProvider(project);
-        provider.modify(new Runnable() {
-            public void run() {
-                Object modelProvider = provider.getModelObject();
-                boolean useSpringAppContext = CXFCorePlugin.getDefault().getJava2WSContext()
-                        .isUseSpringApplicationContext();
-                // jst.web 2.5
-                if (modelProvider instanceof org.eclipse.jst.javaee.web.WebApp) {
-                    org.eclipse.jst.javaee.web.WebApp javaeeWebApp = 
-                        (org.eclipse.jst.javaee.web.WebApp) modelProvider;
-                    addCXFJSTWEB25Servlet(project, javaeeWebApp);
-                    if (useSpringAppContext) {
-                        addSpringApplicationContextWeb25(project, javaeeWebApp);
-                    }
-                }
-                // jst.web 2.4
-                if (modelProvider instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
-                    org.eclipse.jst.j2ee.webapplication.WebApp webApp = 
-                        (org.eclipse.jst.j2ee.webapplication.WebApp) modelProvider;
-                    addCXFJSTWEB24Servlet(project, webApp);
-                    if (useSpringAppContext) {
-                        addSpringApplicationContextWeb24(project, webApp);
-                    }
-                }
-            }
-        }, null);
-
-        if (CXFCorePlugin.getDefault().getJava2WSContext().isAnnotationProcessingEnabled()) {
-            AptConfig.setEnabled(JavaCore.create(project), true);    
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addSpringApplicationContextWeb24(IProject webProject,
-            org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
-        List contextParams = webapp.getContextParams();
-        for (int i = 0; i < contextParams.size(); i++) {
-            ContextParam contextParam = (ContextParam) contextParams.get(i);
-            if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
-                return;
-            }
-        }
-        // org.eclipse.jst.javaee.core.ParamValue
-        List listeners = webapp.getListeners();
-        for (int i = 0; i < listeners.size(); i++) {
-            Listener contextLoaderListener = (Listener) listeners.get(i);
-            if (contextLoaderListener.getListenerClass().getName().equals(
-                    "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        CommonFactory commonFactory = CommonFactory.eINSTANCE;
-        JavaRefFactory javaRefFactory = JavaRefFactory.eINSTANCE;
-
-        org.eclipse.jst.j2ee.common.ParamValue configLocationParam = commonFactory.createParamValue();
-        configLocationParam.setName("contextConfigLocation"); //$NON-NLS-1$
-        configLocationParam.setValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
-        webapp.getContextParams().add(configLocationParam);
-
-        Listener contextLoaderListener = commonFactory.createListener();
-        JavaClass javaClass = javaRefFactory.createJavaClass();
-        javaClass.setName("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
-        contextLoaderListener.setListenerClass(javaClass);
-
-        webapp.getListeners().add(contextLoaderListener);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addSpringApplicationContextWeb25(IProject webProject,
-            org.eclipse.jst.javaee.web.WebApp webapp) {
-        List contextParams = webapp.getContextParams();
-        for (int i = 0; i < contextParams.size(); i++) {
-            ParamValue contextParam = (ParamValue) contextParams.get(i);
-            if (contextParam.getParamName().equals("contextConfigLocation")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        List listeners = webapp.getListeners();
-        for (int i = 0; i < listeners.size(); i++) {
-            org.eclipse.jst.javaee.core.Listener contextLoaderListener = 
-                (org.eclipse.jst.javaee.core.Listener) listeners.get(i);
-            if (contextLoaderListener.getListenerClass().equals(
-                    "org.springframework.web.context.ContextLoaderListener")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        JavaeeFactory javaeeFactory = JavaeeFactory.eINSTANCE;
-
-        ParamValue configLocationParam = javaeeFactory.createParamValue();
-        configLocationParam.setParamName("contextConfigLocation"); //$NON-NLS-1$
-        configLocationParam.setParamValue("WEB-INF/beans.xml"); //$NON-NLS-1$
-
-        webapp.getContextParams().add(configLocationParam);
-
-        org.eclipse.jst.javaee.core.Listener contextLoaderListener = javaeeFactory.createListener();
-        contextLoaderListener.setListenerClass("org.springframework.web.context.ContextLoaderListener"); //$NON-NLS-1$
-
-        webapp.getListeners().add(contextLoaderListener);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCXFJSTWEB24Servlet(IProject webProject, org.eclipse.jst.j2ee.webapplication.WebApp webapp) {
-        List servlets = webapp.getServlets();
-        for (int i = 0; i < servlets.size(); i++) {
-            Servlet servlet = (Servlet) servlets.get(i);
-            if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
-        org.eclipse.jst.j2ee.webapplication.Servlet cxfServlet = factory.createServlet();
-        ServletType servletType = factory.createServletType();
-        cxfServlet.setWebType(servletType);
-        cxfServlet.setServletName("cxf"); //$NON-NLS-1$
-        servletType.setClassName("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
-        cxfServlet.setDisplayName("cxf"); //$NON-NLS-1$
-        cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
-        webapp.getServlets().add(cxfServlet);
-
-        org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping = factory.createServletMapping();
-        servletMapping.setServlet(cxfServlet);
-        servletMapping.setUrlPattern("/services/*"); //$NON-NLS-1$
-        webapp.getServletMappings().add(servletMapping);
-
-        org.eclipse.jst.j2ee.webapplication.SessionConfig sessionConfig = factory.createSessionConfig();
-        sessionConfig.setSessionTimeout(60);
-        webapp.setSessionConfig(sessionConfig);
-    }
-
-    @SuppressWarnings("unchecked")
-    private void addCXFJSTWEB25Servlet(IProject webProject, org.eclipse.jst.javaee.web.WebApp webapp) {
-        List servlets = webapp.getServlets();
-        for (int i = 0; i < servlets.size(); i++) {
-            Servlet servlet = (Servlet) servlets.get(i);
-            if (servlet.getServletName().equals("cxf")) { //$NON-NLS-1$
-                return;
-            }
-        }
-
-        // CXF Servlet
-        WebFactory factory = WebFactory.eINSTANCE;
-        Servlet cxfServlet = factory.createServlet();
-
-        cxfServlet.setServletName("cxf"); //$NON-NLS-1$
-
-        DisplayName cxfServletDisplayName = JavaeeFactory.eINSTANCE.createDisplayName();
-        cxfServletDisplayName.setValue("cxf"); //$NON-NLS-1$
-        cxfServlet.getDisplayNames().add(cxfServletDisplayName);
-
-        Description cxfServletDescription = JavaeeFactory.eINSTANCE.createDescription();
-        cxfServletDescription.setValue("Apache CXF Endpoint"); //$NON-NLS-1$
-        cxfServlet.getDescriptions().add(cxfServletDescription);
-
-        cxfServlet.setServletClass("org.apache.cxf.transport.servlet.CXFServlet"); //$NON-NLS-1$
-
-        cxfServlet.setLoadOnStartup(Integer.valueOf(1));
-
-        webapp.getServlets().add(cxfServlet);
-
-        ServletMapping cxfServletMapping = factory.createServletMapping();
-        cxfServletMapping.setServletName("cxf"); //$NON-NLS-1$
-        UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
-        url.setValue("/services/*"); //$NON-NLS-1$
-        cxfServletMapping.getUrlPatterns().add(url);
-        webapp.getServletMappings().add(cxfServletMapping);
-
-        SessionConfig sessionConfig = factory.createSessionConfig();
-        sessionConfig.setSessionTimeout(new BigInteger("60")); //$NON-NLS-1$
-        webapp.getSessionConfigs().add(sessionConfig);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.java
deleted file mode 100644
index ba24ba7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/facet/CXFFacetUninstallDelegate.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.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * 
- * @author sclarke
- */
-public class CXFFacetUninstallDelegate implements IDelegate {
-
-    public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor)
-            throws CoreException {
-  
-        //TODO Implement
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.project b/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
deleted file mode 100644
index 12dd1e0..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.creation.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3c4e8e2..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:54 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1ef2d3c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.creation.core
-Bundle-Version: 0.4.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.core.commands;x-friends:="org.eclipse.jst.ws.cxf.creation.ui"
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.100,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,2.1.0)"
-Bundle-ActivationPolicy: lazy
-Ant-Version: Apache Ant 1.7.0
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html b/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>September 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
deleted file mode 100644
index 5b6a736..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               .,\
-               plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
deleted file mode 100644
index 9cd8c83..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Creation Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
deleted file mode 100644
index 86de839..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class CXFCreationCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages"; //$NON-NLS-1$
-    public static String WSDL2JAVA_PROJECT_SELECTION_ERROR;
-    public static String WSDL2JAVA_VALID_PORTTYPE_MESSAGE;
-    
-    public static String JAVA2WS_SERVICE_IMPL_NOT_FOUND;
-
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, CXFCreationCoreMessages.class);
-    }
-
-    private CXFCreationCoreMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
deleted file mode 100644
index 7574276..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCoreMessages.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors: 
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-WSDL2JAVA_PROJECT_SELECTION_ERROR=A possible conflict has been detected between project selections.\n\n The current configuration will result in code being generated into the "{0}" project.\n\nTo change the configuration click Cancel and then select the "Service project:" link in the "Configuration:" section in the Web Service wizard.\n\nClick Ok to continue with the current configuration.
-
-WSDL2JAVA_VALID_PORTTYPE_MESSAGE=The WSDL document must have a valid portType element
-
-JAVA2WS_SERVICE_IMPL_NOT_FOUND=The Service implementation "{0}" cannot be loaded from the "{1}" project. Please check that the project contains the class and that it is visible on the projects "Java Build Path".
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
deleted file mode 100644
index 8791927..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/CXFCreationCorePlugin.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- * @author sclarke
- */
-public class CXFCreationCorePlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.creation.core"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFCreationCorePlugin plugin;
-
-    /**
-     * The constructor
-     */
-    public CXFCreationCorePlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFCreationCorePlugin getDefault() {
-        return plugin;
-    }
-
-    public static void logMessage(int severity, String message) {
-        CXFCreationCorePlugin.log(new Status(severity, CXFCreationCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFCreationCorePlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFCreationCorePlugin.log(new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, 
-            exception.getLocalizedMessage(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
deleted file mode 100644
index aaa57ec..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/CXFDeployCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * 
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFDeployCommand extends AbstractDataModelOperation {
-    private static final String CXF_SERVLET = "org.apache.cxf.transport.servlet.CXFServlet"; //$NON-NLS-1$
-    private IProject project;
-    private IWebService webService;
-    private CXFDataModel model;
-    
-    public CXFDeployCommand(String projectName, IWebService webService) {
-        this.project = FileUtils.getProject(projectName);
-        this.webService = webService;
-    }
-    
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        
-        try {
-            WebServiceInfo webServiceInfo = webService.getWebServiceInfo();
-            
-            String serverInstanceId = webServiceInfo.getServerInstanceId();
-            String serverFactoryId = webServiceInfo.getServerFactoryId();
-            if (serverInstanceId != null) {
-                IServer server = ServerCore.findServer(serverInstanceId);
-                String webCobComponentURL = ServerUtils.getEncodedWebComponentURL(project, serverFactoryId,
-                        server);
-                
-                String urlPattern = ""; //$NON-NLS-1$
-                
-                IModelProvider provider = ModelProviderManager.getModelProvider(project);
-                Object modelProvider = provider.getModelObject();
-                // jst.web 2.5
-                if (modelProvider instanceof org.eclipse.jst.javaee.web.WebApp) {
-                    org.eclipse.jst.javaee.web.WebApp javaeeWebApp = 
-                        (org.eclipse.jst.javaee.web.WebApp) modelProvider;
-                    
-                    urlPattern = getURLPattern(javaeeWebApp);
-                }
-                
-                // jst.web 2.4
-                if (modelProvider instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
-                    org.eclipse.jst.j2ee.webapplication.WebApp webApp = 
-                        (org.eclipse.jst.j2ee.webapplication.WebApp) modelProvider;
-                    
-                    urlPattern = getURLPattern(webApp);
-                }
-                
-                urlPattern = urlPattern.substring(0, urlPattern.lastIndexOf("/")); //$NON-NLS-1$
-                String jaxwsEndpointAddress = SpringUtils.getEndpointAddress(project, 
-                        model.getConfigId());
-                
-                String wsdlAddress = webCobComponentURL + urlPattern + jaxwsEndpointAddress;
-                String wsdlURL = wsdlAddress + "?wsdl"; //$NON-NLS-1$
-                
-                webService.getWebServiceInfo().setWsdlURL(wsdlURL);
-                
-                Definition definition = model.getWsdlDefinition();
-
-                ExtensibilityElement extensibilityElement = WSDLUtils.getEndpointAddress(definition);
-                if (extensibilityElement != null) {
-                    if (extensibilityElement instanceof SOAPAddress) {
-                        ((SOAPAddress) extensibilityElement).setLocationURI(wsdlAddress);
-                    }
-                    if (extensibilityElement instanceof SOAP12Address) {
-                        ((SOAP12Address) extensibilityElement).setLocationURI(wsdlAddress);
-                    }
-
-                    WSDLUtils.writeWSDL(model.getWsdlURL(), definition);
-                }              
-            }
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-        return status;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private String getURLPattern(org.eclipse.jst.javaee.web.WebApp javaeeWebApp) {
-        List<org.eclipse.jst.javaee.web.Servlet> servlets = javaeeWebApp.getServlets();
-        for (org.eclipse.jst.javaee.web.Servlet servlet : servlets) {
-            if (servlet.getServletClass().equals(CXF_SERVLET)) {
-                List<org.eclipse.jst.javaee.web.ServletMapping> servletMappings = 
-                    javaeeWebApp.getServletMappings();
-                for (org.eclipse.jst.javaee.web.ServletMapping servletMapping : servletMappings) {
-                    if (servletMapping.getServletName().equals(servlet.getServletName())) {
-                        List<org.eclipse.jst.javaee.core.UrlPatternType> urlPatterns = 
-                            servletMapping.getUrlPatterns();
-                        if (urlPatterns.size() > 0) {
-                            String value = ((org.eclipse.jst.javaee.core.UrlPatternType)
-                                    urlPatterns.get(0)).getValue();
-                            return value;
-                        }
-                    }
-                }
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    @SuppressWarnings("unchecked")
-    private String getURLPattern(org.eclipse.jst.j2ee.webapplication.WebApp webApp) {
-        List<org.eclipse.jst.j2ee.webapplication.Servlet> servlets = webApp.getServlets();
-        for (org.eclipse.jst.j2ee.webapplication.Servlet servlet : servlets) {
-            if (servlet.getServletClass().getJavaName().equals(CXF_SERVLET)) {
-                List<org.eclipse.jst.j2ee.webapplication.ServletMapping> servletMappings = 
-                    webApp.getServletMappings();
-                for (org.eclipse.jst.j2ee.webapplication.ServletMapping servletMapping : servletMappings) {
-                    if (servletMapping.getServlet().getServletName().equals(servlet.getServletName())) {
-                        return servletMapping.getUrlPattern();
-                    }
-                }
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    public void setCXFDataModel(CXFDataModel model) {
-        this.model = model;
-    }
-    
-    public String getClientComponentType() {
-        return "template.cxf.core"; //$NON-NLS-1$
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
deleted file mode 100644
index d5eec92..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/JAXWSAnnotateJavaCommand.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateJavaCommand extends AbstractDataModelOperation {
-
-    private Stack<Change> interfaceUndoChanges = new Stack<Change>();
-    private Stack<Change> classUndoChanges = new Stack<Change>();
-
-    private Java2WSDataModel model;
-    private IType javaClassType;
-    private IType javaInterfaceType;
-    
-    public JAXWSAnnotateJavaCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            if (model.isUseServiceEndpointInterface()) {
-                annotateInterface(monitor);
-
-                if (model.getFullyQualifiedJavaClassName() != null) {
-                    annotateSEIClass(monitor);
-                }
-            } else if (model.getFullyQualifiedJavaClassName() != null) {
-                annotateClass(monitor);
-            }
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (InvocationTargetException ite) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } catch (InterruptedException ie) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } 
-        return status;
-    }
-    
-    private void annotateInterface(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaInterfaceType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaInterfaceName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotating Interface", 
-                (IFile)javaInterfaceType.getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-
-        CXFModelUtils.getWebServiceAnnotationChange(javaInterfaceType, model, textFileChange);
-
-        IMethod[] typeMethods = JDTUtils.getPublicMethods(javaInterfaceType);
-        for (int i = 0; i < typeMethods.length; i++) {
-            IMethod method = typeMethods[i];
-            Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
-                CXFModelUtils.getWebMethodAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
-                CXFModelUtils.getRequestWrapperAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
-                CXFModelUtils.getResponseWrapperAnnotationChange(javaInterfaceType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
-                List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
-                        javaInterfaceType, method);
-                for (SingleVariableDeclaration parameter : parameters) {
-                    CXFModelUtils.getWebParamAnnotationChange(javaInterfaceType, method, parameter, 
-                    		textFileChange);
-                }
-            } 
-        }
-        
-        CXFModelUtils.getImportsChange(javaInterfaceType.getCompilationUnit(), model, 
-        		textFileChange, false);
-        
-        executeChange(monitor, textFileChange, interfaceUndoChanges);
-    }
-    
-    private void annotateClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaClassName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotating Class", 
-                (IFile)javaClassType.getCompilationUnit().getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-        
-        CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-
-        IMethod[] typeMethods = JDTUtils.getPublicMethods(javaClassType);
-        for (int i = 0; i < typeMethods.length; i++) {
-            IMethod method = typeMethods[i];
-            Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
-                CXFModelUtils.getWebMethodAnnotationChange(javaClassType, method, textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
-                CXFModelUtils.getRequestWrapperAnnotationChange(javaClassType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
-                CXFModelUtils.getResponseWrapperAnnotationChange(javaClassType, method, 
-                		textFileChange);
-            }
-            if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
-                List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
-                        javaClassType, method);
-                for (SingleVariableDeclaration parameter : parameters) {
-                    CXFModelUtils.getWebParamAnnotationChange(javaClassType, method, parameter, 
-                    		textFileChange);
-                }
-            } 
-        }
-        
-        CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model, 
-        		textFileChange, false);
-        
-        executeChange(monitor, textFileChange, classUndoChanges);
-    }
-
-    private void annotateSEIClass(IProgressMonitor monitor) throws CoreException, InvocationTargetException,
-            InterruptedException {
-        javaClassType = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                .getFullyQualifiedJavaClassName());
-
-        TextFileChange textFileChange = new TextFileChange("Annotation Changes",
-                (IFile)javaClassType.getCompilationUnit().getResource());
-        MultiTextEdit multiTextEdit = new MultiTextEdit();
-        textFileChange.setEdit(multiTextEdit);
-
-        CXFModelUtils.getWebServiceAnnotationChange(javaClassType, model, textFileChange);
-        
-        CXFModelUtils.getImportsChange(javaClassType.getCompilationUnit(), model, 
-        		textFileChange, true);
-
-        executeChange(monitor, textFileChange, classUndoChanges);
-    }
-    
-    private void executeChange(IProgressMonitor monitor, Change change, Stack<Change> undoChanges) 
-            throws InvocationTargetException, InterruptedException {
-        
-        if (change == null) {
-            return;
-        }
-        
-        change.initializeValidationData(monitor);
-
-        PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
-        WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(changeOperation);
-        PlatformUI.getWorkbench().getProgressService().runInUI(new BusyIndicatorRunnableContext(), adapter,
-                adapter.getSchedulingRule());
-
-        if (undoChanges != null && changeOperation.changeExecuted()) {
-            undoChanges.push(changeOperation.getUndoChange());
-        }        
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            if (javaInterfaceType != null) {
-                while (!interfaceUndoChanges.isEmpty()) {
-                    Change undoChange = interfaceUndoChanges.pop();
-                    if (undoChange != null) {
-                        executeChange(monitor, undoChange, null);
-                    }
-                }
-            }
-            if (javaClassType != null) {
-                while (!classUndoChanges.isEmpty()) {
-                    Change undoChange = classUndoChanges.pop();
-                    if (undoChange != null) {
-                        executeChange(monitor, undoChange, null);
-                    }
-                }
-            }
-        } catch (InvocationTargetException ite) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } catch (InterruptedException ie) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
deleted file mode 100644
index 4482f3a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSCommand.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.java2ws.JavaToWS</code> or the 
- * <code>org.apache.cxf.tools.java2wsdl.JavaToWSDL</code> command depending on the version
- * of CXF used.
- * 
- * @author sclarke
- */
-public class Java2WSCommand extends AbstractDataModelOperation {
-    private static String JAVA2WSDL_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2wsdl.JavaToWSDL"; //$NON-NLS-1$
-    private static String JAVA2WS_TOOL_CLASS_NAME = "org.apache.cxf.tools.java2ws.JavaToWS"; //$NON-NLS-1$
-    private String CXF_TOOL_CLASS_NAME;
-
-    private Java2WSDataModel model;
-    private String projectName;
-    
-    private JavaResourceChangeListener javaResourceChangeListener;
-    private WebContentChangeListener webContentChangeListener;
-    
-    public Java2WSCommand(Java2WSDataModel model) {
-        this.model = model;
-        projectName = model.getProjectName();
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        javaResourceChangeListener = new JavaResourceChangeListener(JDTUtils
-                .getJavaProjectSourceDirectoryPath(projectName, model.getJavaStartingPoint()));
-        webContentChangeListener = new WebContentChangeListener(projectName);
-
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener, 
-                IResourceChangeEvent.POST_CHANGE);
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener, 
-                IResourceChangeEvent.POST_CHANGE);
-
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            CXF_TOOL_CLASS_NAME = JAVA2WS_TOOL_CLASS_NAME;
-        } else {
-            CXF_TOOL_CLASS_NAME = JAVA2WSDL_TOOL_CLASS_NAME;
-        }
-
-        String[] progArgs = CommandLineUtils.getJava2WSProgramArguments(model);
-
-        try {
-            IProject project = FileUtils.getProject(projectName);
-            IJavaProject javaProject = JDTUtils.getJavaProject(project);
-            LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyJ2WFilesFromTmp(model);
-            
-            if (model.isGenerateWSDL()) {
-            	SpringUtils.loadSpringConfigInformationFromWSDL((model));
-            }
-            
-            if (model.getFullyQualifiedJavaClassName() != null && 
-                    model.getFullyQualifiedJavaClassName().trim().length() > 0) {
-                SpringUtils.createJAXWSEndpoint(model);
-            }
-            
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);
-        } finally {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-            FileUtils.refreshProject(projectName, monitor);
-        }
-
-        return status;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-        Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        model.setGenerateClient(context.isGenerateClient());
-        model.setGenerateServer(context.isGenerateServer());
-        model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
-        model.setGenerateWSDL(context.isGenerateWSDL());
-        model.setSoap12Binding(context.isSoap12Binding());
-        model.setGenerateXSDImports(context.isGenerateXSDImports());
-        return status;
-    }
-    
-    public CXFDataModel getCXFDataModel() {
-        return model;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
deleted file mode 100644
index bb62262..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSDefaultingCommand.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.util.Locale;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-public class Java2WSDefaultingCommand extends AbstractDataModelOperation {
-    private Java2WSDataModel model;
-
-    public Java2WSDefaultingCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-            model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-            model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-
-            IType startingPointType = getJavaStartingPointType(); 
-            model.setUseServiceEndpointInterface(startingPointType.isInterface());
-            model.setExtractInterface(false);
-            
-            String packageName = startingPointType.getPackageFragment().getElementName();
-            model.setTargetNamespace(JDTUtils.getTargetNamespaceFromPackageName(packageName));
-            
-            model.setAnnotationProcessingEnabled(context.isAnnotationProcessingEnabled());
-            model.setGenerateWebMethodAnnotation(context.isGenerateWebMethodAnnotation());
-            model.setGenerateWebParamAnnotation(context.isGenerateWebParamAnnotation());
-            model.setGenerateRequestWrapperAnnotation(context.isGenerateRequestWrapperAnnotation());
-            model.setGenerateResponseWrapperAnnotation(context.isGenerateResponseWrapperAnnotation());
-            model.setAnnotationMap(CXFModelUtils.getAnnotationMap(model));
-            model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-            
-            model.setGenerateXSDImports(context.isGenerateXSDImports());
-            model.setDatabinding(context.getDatabinding());
-            model.setFrontend(context.getFrontend());
-            model.setGenerateClient(context.isGenerateClient());
-            model.setGenerateServer(context.isGenerateServer());
-            model.setSoap12Binding(context.isSoap12Binding());
-            model.setGenerateWrapperFaultBeans(context.isGenerateWrapperFaultBeans());
-            model.setGenerateWSDL(context.isGenerateWSDL());
-            model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
-            model.setVerbose(context.isVerbose());
-            
-            String className = JDTUtils.getClassName(model.getProjectName(), model.getJavaStartingPoint());
-            model.setWsdlFileName(className.toLowerCase() + WSDLUtils.WSDL_FILE_EXTENSION);
-        } catch (JavaModelException jme) {
-            status = jme.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-        return status;
-    }
-
-    public CXFDataModel getJava2WSDataModel() {
-        return model;
-    }
-
-    public IType getJavaStartingPointType() {
-        String projectName = model.getProjectName();
-        String javaStartingPoint = model.getJavaStartingPoint();
-
-        IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-        IType startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
-        return startingPointType;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
deleted file mode 100644
index 3313c50..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSSelectSEICommand.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CheckConditionsOperation;
-import org.eclipse.ltk.core.refactoring.CreateChangeOperation;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEICommand extends AbstractDataModelOperation {
-    private Change undoExtractInterfaceChange;
-
-    private Java2WSDataModel model;
-    
-    private  IType startingPointType;
-
-    public Java2WSSelectSEICommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        try {
-            String projectName = model.getProjectName();
-            String javaStartingPoint = model.getJavaStartingPoint();
-
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            startingPointType = JDTUtils.getType(javaProject, javaStartingPoint);
-            
-            if (startingPointType.isInterface()) {
-                model.setFullyQualifiedJavaInterfaceName(startingPointType.getFullyQualifiedName());
-            } else if (startingPointType.isClass()) {
-                model.setFullyQualifiedJavaClassName(startingPointType.getFullyQualifiedName());
-                if (model.isUseServiceEndpointInterface() && model.isExtractInterface()) {
-                    extractInterface(startingPointType, monitor);
-                }
-            }
-        } catch (JavaModelException jme) {
-            status = jme.getStatus();
-            CXFCreationCorePlugin.log(status);
-        }
-
-        return status;
-    }
-
-    private void extractInterface(IType type, IProgressMonitor monitor) {
-        try {
-            final ExtractInterfaceProcessor extractInterfaceProcessor = new ExtractInterfaceProcessor(type,
-                    JavaPreferencesSettings.getCodeGenerationSettings(type.getJavaProject()));
-            Refactoring extractInterfaceRefactoring = new ProcessorBasedRefactoring(extractInterfaceProcessor) {
-
-                @Override
-                public RefactoringProcessor getProcessor() {
-                    return extractInterfaceProcessor;
-                }
-            };
-            extractInterfaceProcessor.setTypeName(model.getServiceEndpointInterfaceName());
-            extractInterfaceProcessor.setReplace(false);
-            
-            Set<IMethod> methods = model.getMethodMap().keySet();
-            extractInterfaceProcessor.setExtractedMembers(methods.toArray(new IMember[methods.size()]));
-            extractInterfaceProcessor.setAbstract(false);
-            extractInterfaceProcessor.setPublic(true);
-            extractInterfaceProcessor.setComments(false);
-            extractInterfaceProcessor.setInstanceOf(false);
-
-            CreateChangeOperation createChangeOperation = new CreateChangeOperation(
-                    new CheckConditionsOperation(extractInterfaceRefactoring,
-                            CheckConditionsOperation.FINAL_CONDITIONS), RefactoringCore
-                            .getConditionCheckingFailedSeverity());
-            
-            PerformChangeOperation performChangeOperation = new PerformChangeOperation(createChangeOperation);
-            
-            WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(performChangeOperation);
-            PlatformUI.getWorkbench().getProgressService().runInUI(
-                new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-
-            if (performChangeOperation.changeExecuted()) {
-                String packageName = type.getPackageFragment().getElementName();
-                if (packageName.trim().length() > 0) {
-                    packageName += ".";
-                }
-                String fullyQualifiedJavaInterfaceName = packageName + extractInterfaceProcessor.getTypeName();
-                model.setFullyQualifiedJavaInterfaceName(fullyQualifiedJavaInterfaceName);
-                model.setMethodMap(CXFModelUtils.getMethodMap(JDTUtils.getType(model.getProjectName(), 
-                        fullyQualifiedJavaInterfaceName), model));
-                
-                undoExtractInterfaceChange = performChangeOperation.getUndoChange();
-            }
-        } catch (JavaModelException jme) {
-            CXFCreationCorePlugin.log(jme.getStatus());
-        } catch (InvocationTargetException ite) {
-            CXFCreationCorePlugin.log(ite);
-        } catch (InterruptedException ie) {
-            CXFCreationCorePlugin.log(ie);
-        } 
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        if (undoExtractInterfaceChange != null) {
-            try {
-            	PerformChangeOperation changeOperation = new PerformChangeOperation(undoExtractInterfaceChange);
-            
-                WorkbenchRunnableAdapter adapter= new WorkbenchRunnableAdapter(changeOperation);
-                PlatformUI.getWorkbench().getProgressService().runInUI(
-                        new BusyIndicatorRunnableContext(), adapter, adapter.getSchedulingRule());
-                
-                if (!startingPointType.getCompilationUnit().isConsistent()) {
-                    startingPointType.getCompilationUnit().makeConsistent(monitor);
-                }
-
-                model.setMethodMap(CXFModelUtils.getMethodMap(startingPointType, model));
-
-            } catch (JavaModelException jme) {
-                status = jme.getStatus();
-                CXFCreationCorePlugin.log(status);
-            } catch (InvocationTargetException ite) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ite.getLocalizedMessage());
-                CXFCreationCorePlugin.log(status);
-            } catch (InterruptedException ie) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ie.getLocalizedMessage());
-                CXFCreationCorePlugin.log(status);
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
deleted file mode 100644
index b65308d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/Java2WSValidateInputCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class Java2WSValidateInputCommand extends AbstractDataModelOperation {
-    
-    private Java2WSDataModel model;
-
-    public Java2WSValidateInputCommand(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
-        if (javaProject != null) {
-            IType type = JDTUtils.getType(javaProject, model.getJavaStartingPoint());
-            if (type == null || !type.exists()) {
-                status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, 
-                        CXFCreationCoreMessages.bind(CXFCreationCoreMessages.JAVA2WS_SERVICE_IMPL_NOT_FOUND,
-                                new Object[] {model.getJavaStartingPoint(), model.getProjectName()}));
-            }
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
deleted file mode 100644
index a4db1c3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.JavaResourceChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CommandLineUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.SpringUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-/**
- * Provides a wrapper around the <code>org.apache.cxf.tools.wsdlto.WSDLToJava</code> command.
- * 
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-    public static final String CXF_TOOL_CLASS_NAME = "org.apache.cxf.tools.wsdlto.WSDLToJava"; //$NON-NLS-1$
-    
-    private WSDL2JavaDataModel model;
-    private IWebService ws;
-
-    private JavaResourceChangeListener javaResourceChangeListener;
-    private WebContentChangeListener webContentChangeListener;
-
-    public WSDL2JavaCommand(WSDL2JavaDataModel model, IWebService ws) {
-        this.model = model;
-        this.ws = ws;
-    }
-
-    @Override
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        javaResourceChangeListener = new JavaResourceChangeListener(model.getJavaSourceFolder());
-        webContentChangeListener = new WebContentChangeListener(model.getProjectName());
-
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(javaResourceChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-        ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
-                IResourceChangeEvent.POST_CHANGE);
-
-        String projectName = model.getProjectName();
-        
-        //TODO revisit
-        ws.getWebServiceInfo().setImplURLs(new String[] {projectName + "/Impl.java"}); //$NON-NLS-1$
-
-        String[] progArgs = CommandLineUtils.getWSDL2JavaProgramArguments(model);
-
-        try {
-            IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-            LaunchUtils.launch(javaProject, CXF_TOOL_CLASS_NAME, progArgs);
-            FileUtils.copyW2JFilesFromTmp(model);
-
-            if (model.isGenerateImplementation()) {
-                SpringUtils.createConfigurationFromWSDL(model);
-            }
-
-        } catch (CoreException ce) {
-            status = ce.getStatus();
-            CXFCreationCorePlugin.log(status);
-        } catch (IOException ioe) {
-            status = new Status(IStatus.ERROR, CXFCreationCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-            CXFCreationCorePlugin.log(status);  
-        } finally {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(javaResourceChangeListener);
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-            FileUtils.refreshProject(projectName, monitor);
-        }
-
-        return status;
-    }
-
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(javaResourceChangeListener.getChangedResources());
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-        return status;
-    }
-    
-    public CXFDataModel getCXFDataModel() {
-        return model;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
deleted file mode 100644
index 112f518..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaDefaultingCommand.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.WSDL2JavaPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.resources.WebContentChangeListener;
-import org.eclipse.jst.ws.internal.cxf.core.utils.FileUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.util.WSDLCopier;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaDefaultingCommand extends AbstractDataModelOperation {
-    private WSDL2JavaDataModel model;
-    private String projectName;
-    private String inputURL;
-    
-    private WebContentChangeListener webContentChangeListener;
-    
-    public WSDL2JavaDefaultingCommand(WSDL2JavaDataModel model, String projectName, String inputURL) {
-        this.model = model;
-        this.projectName = projectName;
-        this.inputURL = inputURL;
-    }
-
-    @Override
-    @SuppressWarnings({ "unchecked", "deprecation" })
-    public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-    	IStatus status = Status.OK_STATUS;
-    	
-    	webContentChangeListener = new WebContentChangeListener(projectName);
-    	ResourcesPlugin.getWorkspace().addResourceChangeListener(webContentChangeListener,
-    	        IResourceChangeEvent.POST_CHANGE);
-    	
-        WSDL2JavaPersistentContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        model.setCxfRuntimeVersion(context.getCxfRuntimeVersion());
-        model.setCxfRuntimeEdition(context.getCxfRuntimeEdition());
-        //
-        model.setGenerateImplementation(context.isGenerateImplementation());
-        model.setGenerateServer(context.isGenerateServer());
-        model.setDatabinding(context.getDatabinding());
-        model.setFrontend(context.getFrontend());
-        model.setWsdlVersion(context.getWsdlVersion());
-        model.setGenerateAntBuildFile(context.isGenerateAntBuildFile());
-        model.setIncludedNamespaces(new HashMap<String, String>());
-        model.setExcludedNamespaces(new HashMap<String, String>());
-
-        // XJC
-        model.setXjcUseDefaultValues(context.isXjcUseDefaultValues());
-        model.setXjcToString(context.isXjcToString());
-        model.setXjcToStringMultiLine(context.isXjcToStringMultiLine());
-        model.setXjcToStringSimple(context.isXjcToStringSimple());
-        model.setXjcLocator(context.isXjcLocator());
-        model.setXjcSyncMethods(context.isXjcSyncMethods());
-        model.setXjcMarkGenerated(context.isXjcMarkGenerated());
-
-        model.setValidate(context.isValidate());
-        model.setProcessSOAPHeaders(context.isProcessSOAPHeaders());
-        model.setLoadDefaultExcludesNamepsaceMapping(context.isLoadDefaultExcludesNamepsaceMapping());
-        model.setLoadDefaultNamespacePackageNameMapping(context.isLoadDefaultNamespacePackageNameMapping());
-        model.setUseDefaultValues(context.isUseDefaultValues());
-        model.setAutoNameResolution(context.isAutoNameResolution());
-        model.setNoAddressBinding(context.isNoAddressBinding());
-        model.setUseSpringApplicationContext(context.isUseSpringApplicationContext());
-        model.setJavaSourceFolder(JDTUtils.getJavaProjectSourceDirectoryPath(model.getProjectName()));
-
-    	try {
-    		Definition definition = null;
-        	IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        	IProject project = workspace.getRoot().getProject(projectName);
-        	URL wsdlUrl = new URL(inputURL);
-        	model.setWsdlURL(wsdlUrl);
-        	if (wsdlUrl.getProtocol().equals("file")) { //$NON-NLS-1$
-        		if (!FileUtils.isFileInWebContentFolder(project, new Path(wsdlUrl.getPath()))) {
-        		    IFolder wsdlFolder = WSDLUtils.getWSDLFolder(project);
-        			IPath wsdlFolderPath = wsdlFolder.getLocation();
-                    File fileToCopy = new File(wsdlUrl.toURI());
-        			WSDLCopier copier = new WSDLCopier();
-        			//for Eclipse 3.3 compatibility
-        			copier.setSourceURI(wsdlUrl.toExternalForm());
-        			copier.setTargetFolderURI(wsdlFolder.getLocationURI().toString());
-                    //copier.setTargetFolderURI(wsdlFolderPath.toFile().toString());
-        			workspace.run(copier, monitor);
-        			wsdlFolder.refreshLocal(IResource.DEPTH_ONE, monitor);
-        			File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(fileToCopy.getName()).toFile();
-        			model.setWsdlURL(wsdlFile.toURL());
-        		}
-            	definition = WSDLUtils.readWSDL(model.getWsdlURL());
-            	if (definition != null) {
-            	    setTNSOnModel(definition);
-            	    
-            	    String wsdlLocation = WSDLUtils.getWSDLLocation(definition);
-            	    if (wsdlLocation != null) {
-                        model.setWsdlLocation(wsdlLocation);
-            	    }
-            	}
-        	} else {
-               	String filename = ""; //$NON-NLS-1$
-               	definition = WSDLUtils.readWSDL(wsdlUrl);
-        		if (definition != null) {
-                    Map servicesMap = definition.getServices();
-                    Set<Map.Entry> servicesSet = servicesMap.entrySet();
-                    setTNSOnModel(definition);
-                    for (Map.Entry serviceEntry : servicesSet) {
-                        Service service = (Service) serviceEntry.getValue();
-                        Map portsMap = service.getPorts();
-                        Set<Map.Entry> portsSet = portsMap.entrySet();                     
-                        for (Map.Entry portEntry : portsSet) {
-                            Port port = (Port) portEntry.getValue();
-                            PortType portType = port.getBinding().getPortType();
-                            QName qName = portType.getQName();
-                            filename = qName.getLocalPart() + WSDLUtils.WSDL_FILE_EXTENSION;
-                            break;
-                        }
-                    }
-        		}
-        		IPath wsdlFolderPath = WSDLUtils.getWSDLFolder(project).getLocation();
-            	WSDLCopier copier = new WSDLCopier();
-            	copier.setSourceURI(wsdlUrl.toExternalForm());
-            	copier.setTargetFolderURI(wsdlFolderPath.toFile().toURI().toString());
-            	copier.setTargetFilename(filename);
-            	workspace.run(copier, monitor);
-            	
-            	File wsdlFile = wsdlFolderPath.addTrailingSeparator().append(filename).toFile();
-    			model.setWsdlURL(wsdlFile.toURI().toURL());
-        	}
-        	model.setWsdlFileName(WSDLUtils.getWSDLFileNameFromURL(model.getWsdlURL()));
-        	
-        	IPath wsdlLocationPath = new Path(model.getWsdlURL().getPath());
-        	wsdlLocationPath = wsdlLocationPath.removeFirstSegments(WSDLUtils.getWebContentFolder(project)
-        			.getLocation().matchingFirstSegments(wsdlLocationPath));
-        	
-        	if (wsdlLocationPath.getDevice() != null) {
-        	    wsdlLocationPath = wsdlLocationPath.setDevice(null);
-        	}
-        	model.setWsdlDefinition(definition);
-        	model.setConfigWsdlLocation(wsdlLocationPath.toString());
-        	
- 		} catch (CoreException ce) {
- 			status = ce.getStatus();
-			CXFCreationCorePlugin.log(status);
-		} catch (URISyntaxException urise) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, urise.getLocalizedMessage());
-			CXFCreationCorePlugin.log(status);
-		} catch (MalformedURLException murle) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, murle.getLocalizedMessage());
-			CXFCreationCorePlugin.log(murle);
-		} catch (IOException ioe) {
-			status = new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, ioe.getLocalizedMessage());
-			CXFCreationCorePlugin.log(ioe);
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(webContentChangeListener);
-        return status;
-    }
-    
-    private void setTNSOnModel(Definition definition) {
-        String targetNamespace = definition.getTargetNamespace();
-        String packageName = WSDLUtils.getPackageNameFromNamespace(targetNamespace);
-        model.setTargetNamespace(targetNamespace);
-        model.getIncludedNamespaces().put(targetNamespace, packageName);
-    }
-
-    public WSDL2JavaDataModel getWSDL2JavaDataModel() {
-        return model;
-    }
-    
-    @Override
-    public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-        IStatus status = Status.OK_STATUS;
-        List<IResource> changedResources = new ArrayList<IResource>();
-        changedResources.addAll(webContentChangeListener.getChangedResources());
-        if (changedResources.size() > 0) {
-            for (IResource resource : changedResources) {
-                try {
-                    resource.delete(true, monitor);
-                } catch (CoreException ce) {
-                    status = ce.getStatus();
-                    CXFCreationCorePlugin.log(status);
-                }
-            }
-        }
-        
-        model.getBindingFiles().clear();
-        model.getIncludedNamespaces().clear();
-       
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
deleted file mode 100644
index 64dab7f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.core/src/org/eclipse/jst/ws/internal/cxf/creation/core/commands/WSDL2JavaProjectSelectionCommand.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.core.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.CXFCreationCoreMessages;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-/**
- * This is stop gap workaround for bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243286">#243286</a>
- * and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243290">#243290</a>
- * 
- * @author sclarke
- *
- */
-public class WSDL2JavaProjectSelectionCommand extends AbstractDataModelOperation {
-	private WSDL2JavaDataModel model;
-	private IProject initialProject;
-	private IProject serverProject;
-	private IProject currentProject;
-	
-	public WSDL2JavaProjectSelectionCommand(WSDL2JavaDataModel model) {
-		this.model = model;
-	}
-	
-	@Override
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IStatus status = Status.OK_STATUS;
-
-		if (currentProject == null && initialProject == null && serverProject != null) {
-			status = Status.OK_STATUS;
-			model.setProjectName(serverProject.getName());
-			return status;
-		}
-		
-		if (currentProject == null && initialProject != null && !initialProject.equals(serverProject)) {
-			status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-					CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-							serverProject.getName(), initialProject.getName()}));
-		} else if (initialProject == null && currentProject != null && !currentProject.equals(serverProject)) { 
-            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-                    CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-                            serverProject.getName(), currentProject.getName()}));
-		} else if (initialProject != null && currentProject != null && !currentProject.equals(serverProject)) {
-            status = new Status(IStatus.WARNING, CXFCorePlugin.PLUGIN_ID, CXFCreationCoreMessages.bind(
-                    CXFCreationCoreMessages.WSDL2JAVA_PROJECT_SELECTION_ERROR, new Object[]{
-                            serverProject.getName(), currentProject.getName()}));
-		} else { 
-		    model.setProjectName(serverProject.getProject().getName());
-			status = Status.OK_STATUS;
-		}
-		
-		if (!status.isOK()) {
-			try {
-				getEnvironment().getStatusHandler().report(status);
-			} catch (StatusException e) {
-				return new Status(IStatus.ERROR, CXFCorePlugin.PLUGIN_ID, 0, "", null);
-			}
-		}
-		return status;
-	}
-	
-	/*
-	 * The value to test against. Make sure the "Service Project"
-	 * and the project that contains the wsdl file match.
-	 */
-	public void setServerProject(IProject serverProject) {
-		this.serverProject = serverProject;
-	}
-	
-	/*
-	 * 
-	 * The initial project will be null when there's nothing selected in the project explorer
-	 * This forces the user to make a selection thus setting the project current project
-	 * below.
-	 * 
-	 * If there was an initial selection and the user changes from one top down service
-	 * type to another then we had to check.
-	 */
-	public void setInitialProject(IProject project) {
-		this.initialProject = project;
-	}
-	
-	/*
-	 * If there was an initial selection in the project explorer the above value is set and
-	 * this is set to null.
-	 * 
-	 * This will change however if the user modifies the text field or browses for a
-	 * wsdl file. Upon selecting a file in a valid location, this value gets set.
-	 * No problem in that situation.
-	 */
-	public void setProject(IProject project) {
-	    this.currentProject = project;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
deleted file mode 100644
index 2c253e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.creation.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cadd13..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:55 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6858d92..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.creation.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.creation.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt;x-internal:=true
-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.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.core;bundle-version="0.4.3",
- org.eclipse.jst.ws.cxf.creation.core;bundle-version="0.3.5",
- org.eclipse.wst.ws;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.command.env.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.cxf.ui;bundle-version="0.3.5",
- org.eclipse.jst.ws.cxf.consumption.ui;bundle-version="0.3.3",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws.creation.ui;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.emf.common;bundle-version="[2.4.0,3.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Ant-Version: Apache Ant 1.7.0
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.creation.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.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.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/build.properties
deleted file mode 100644
index 4df2950..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               icons/,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif
deleted file mode 100644
index ba42e76..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/disabled.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties
deleted file mode 100644
index ef52b4d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Creation UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-CXF_WS_RUNTIME_LABEL=Apache CXF 2.x
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml
deleted file mode 100644
index f254680..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/plugin.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
-      <runtime
-        id="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
-        label="%CXF_WS_RUNTIME_LABEL"
-        serverRequired="false"/>
-    </extension>
-
-	<!-- define support for CXF JAX-WS Java First and WSDL First in web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
-      <serviceRuntime
-        id="org.eclipse.jst.ws.cxf.creation.java" 
-        serviceImplementationTypeId="org.eclipse.jst.ws.cxf.wsImpl.java"
-        runtimeId="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
-        bottomUp="true"
-        topDown="true"
-        class="org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt.CXFWebServiceRuntime">
-
-        <required-facet-version facet="jst.web" version="2.4" allow-newer="true"/>
-        <required-facet-version facet="jst.java" version="5.0" allow-newer="true"/>
-        <required-facet-version facet="cxf.core" version="1.0" allow-newer="true"/>
-      </serviceRuntime>
-    </extension>
-
-    <!-- define support for CXF Java clients in Web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
-       <clientRuntime
-          id="org.eclipse.jst.ws.cxf.consumption.web"
-          clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
-          runtimeId="org.eclipse.jst.ws.cxf.cxfWebServiceRT"
-          class="org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt.CXFWebServiceRuntime">
-
-          <required-facet-version facet="jst.web" version="2.4" allow-newer="true"/>
-          <required-facet-version facet="jst.java" version="5.0" allow-newer="true"/>
-          <required-facet-version facet="cxf.core" version="1.0" allow-newer="true"/>
-       </clientRuntime>
-    </extension> 
-    
-    <!-- bugs #243286 #243290 -->
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.WSDL2JavaProjectSelectionWidgetFactory"
-             id="ProjectSelectionConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand"/>
-    </extension> 
-
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.Java2WSSelectSEIWidgetFactory"
-             id="Java2WSPreCheckConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSSelectSEICommand">
-       </widgetFactory>
-    </extension>
-    
-   <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.JAXWSAnnotateWidgetFactory"
-             id="JAXWSAnnotateConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.JAXWSAnnotateJavaCommand">
-       </widgetFactory>
-    </extension>
- 
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.Java2WSConfigWidgetFactory"
-             id="Java2WSConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSCommand">
-       </widgetFactory>
-    </extension>
-    
-    <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory
-             class="org.eclipse.jst.ws.internal.cxf.creation.ui.widgets.WSDL2JavaConfigWidgetFactory"
-             id="WSDL2JavaConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaCommand">
-       </widgetFactory>
-    </extension>
-   
- </plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java
deleted file mode 100644
index 9a911ab..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIMessages.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author sclarke
- */
-public class CXFCreationUIMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUImessages"; //$NON-NLS-1$
-    public static String JAVA2WS_ENTER_SEI_NAME;
-    public static String JAVA2WS_SELECT_SEI_EXTRACTED_METHODS;
-    public static String JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY;
-    public static String JAVA2WS_SELECT_SEI_OPTION;
-    public static String JAVA2WS_ENTER_VALID_WSDL_NAME;
-
-    public static String JAVA2WS_CLASS_CONFIG_PAGE_TITLE;
-    public static String JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION;
-
-    public static String JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE;
-    public static String JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION;
-                         
-    public static String JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE;
-    public static String JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION;
-    
-    public static String JAVA2WS_PAGE_TITLE;
-    public static String JAVA2WS_PAGE_DESCRIPTION;
-    public static String JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW;
-    public static String JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE;
-
-    public static String WSDL2JAVA_PAGE_TITLE;
-    public static String WSDL2JAVA_PAGE_DESCRIPTION;
-
-    public static String WSDL2JAVA_DEFAULTS_PAGE_TITLE;
-    public static String WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION;
-
-    public static String JAVA2WS_GROUP_LABEL;
-
-    public static String WSDL2JAVA_GROUP_LABEL;
-    public static String WSDL2JAVA_XJC_ARG_GROUP_LABEL;
-    
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, CXFCreationUIMessages.class);
-    }
-
-    private CXFCreationUIMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
deleted file mode 100644
index b7cd159..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUIPlugin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- * @author sclarke
- */
-public class CXFCreationUIPlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.creation.ui"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFCreationUIPlugin plugin;
-
-    /**
-     * The constructor
-     */
-    public CXFCreationUIPlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFCreationUIPlugin getDefault() {
-        return plugin;
-    }
-
-    /**
-     * Returns an image descriptor for the image file at the given plug-in
-     * relative path
-     * 
-     * @param path
-     *            the path
-     * @return the image descriptor
-     */
-    public static ImageDescriptor getImageDescriptor(String path) {
-        return imageDescriptorFromPlugin(PLUGIN_ID, path);
-    }
-
-    public static void logMessage(int severity, String message) {
-        CXFCreationUIPlugin.log(new Status(severity, CXFCreationUIPlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFCreationUIPlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFCreationUIPlugin.log(new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-            exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties
deleted file mode 100644
index f0ab9fe..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/CXFCreationUImessages.properties
+++ /dev/null
@@ -1,47 +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
-###############################################################################
-
-#Java2WS Pre Config Widget Factory
-JAVA2WS_CLASS_CONFIG_PAGE_TITLE={0} {1} Web Service Java Class Starting Point Configuration
-JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION=Select the Service Endpoint Interface (SEI) from the Type Hierarchy or Extract an SEI from the class
-
-JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE={0} {1} Web Service Java Interface Starting Point Configuration
-JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW=Preview:
-JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION=Select an implementation for the interface. Optional step for configuration purposes.
-
-#Java2WS Config Widget Factory
-JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE={0} {1} Web Service Annotate Java Configuration
-JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION=Set the Annotation options on this page
-
-JAVA2WS_PAGE_TITLE={0} {1} Web Service Java2WS Configuration
-JAVA2WS_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-#WSDL2Java Config Widget Factory
-WSDL2JAVA_PAGE_TITLE={0} {1} Web Service WSDL2Java Configuration
-WSDL2JAVA_PAGE_DESCRIPTION=Customise your Web Service generation by selecting options on this page
-
-WSDL2JAVA_DEFAULTS_PAGE_TITLE={0} {1} Web Service WSDL2Java Configuration
-WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION=The page allows the overriding of the default preferences for this Web Service generation
-
-#Java2WS Config Widget
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-
-JAVA2WS_ENTER_SEI_NAME=Please enter the name of the SEI to extract
-JAVA2WS_SELECT_SEI_EXTRACTED_METHODS=Please select the methods you wish to extract from the {0} class
-JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY=Please select an Interface from the Type Hierarchy
-JAVA2WS_SELECT_SEI_OPTION=Please select an SEI option
-
-JAVA2WS_ENTER_VALID_WSDL_NAME=Please enter a valid WSDL File name
-
-#WSDL2Java Defaults Config Widget
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options
-WSDL2JAVA_XJC_ARG_GROUP_LABEL=XJC Arguments
-JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE=Select the Methods to annotate:
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java
deleted file mode 100644
index 4c7851d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/selection/IStructuredSelectionToIProjectTransformer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.selection;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.core.data.Transformer;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class IStructuredSelectionToIProjectTransformer implements Transformer {
-
-    public Object transform(Object value) {
-        IStructuredSelection structuredSelection = (IStructuredSelection) value;
-        Object firstElement = structuredSelection.getFirstElement();
-        if (firstElement instanceof IResource) {
-            IResource resource = (IResource) firstElement;
-            return resource.getProject();
-        }
-        return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java
deleted file mode 100644
index a1846a8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/viewers/AnnotationColumnLabelProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.viewers;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.internal.core.SourceMethod;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class AnnotationColumnLabelProvider extends ColumnLabelProvider {
-    private Image addAnnotationImage;
-    private Image removeAnnotationImage;
-    private Image disabled;
-
-    private Map<IMethod, Map<String, Boolean>> methodMap;
-    private String annotationKey;
-    private IType type;
-
-    public AnnotationColumnLabelProvider(Java2WSDataModel model, String annotationKey, IType type) {
-        this.methodMap = model.getMethodMap();
-        this.annotationKey = annotationKey;
-        this.type = type;
-        addAnnotationImage = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
-                "icons/obj16/true.gif").createImage(); //$NON-NLS-1$
-        removeAnnotationImage = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
-                "icons/obj16/false.gif").createImage(); //$NON-NLS-1$
-        disabled = CXFCreationUIPlugin.imageDescriptorFromPlugin(CXFCreationUIPlugin.PLUGIN_ID,
-                "icons/obj16/disabled.gif").createImage(); //$NON-NLS-1$
-    }
-
-    public String getText(Object element) {
-        return ""; //$NON-NLS-1$
-    }
-
-    @Override
-    public Image getImage(Object element) {
-        if (element instanceof SourceMethod) {
-            if (methodMap == null || annotationKey == null || type == null) {
-                return null;
-            }
-
-            IMethod method = (SourceMethod) element;
-
-            if (annotationKey.equals(CXFModelUtils.WEB_PARAM)) {
-                List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(type,
-                        method);
-
-                if (parameters.size() == 0) {
-                    return disabled;
-                }
-                for (SingleVariableDeclaration parameter : parameters) {
-                    if (AnnotationUtils.isAnnotationPresent(parameter, annotationKey)) {
-                        return disabled;
-                    }
-                }
-            }
-            
-            if (AnnotationUtils.isAnnotationPresent(method, annotationKey)) {
-                return disabled;
-            }
-            
-            if (methodMap.get(method) != null) {
-                Boolean addAnnotation =  methodMap.get(method).get(annotationKey);
-                if (addAnnotation) {
-                    return addAnnotationImage;
-                } else {
-                    return removeAnnotationImage;
-                }                
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        addAnnotationImage.dispose();
-        removeAnnotationImage.dispose();
-        disabled.dispose();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java
deleted file mode 100644
index b7550ba..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateJavaWidget.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.jdt.internal.core.SourceMethod;
-import org.eclipse.jdt.internal.core.SourceType;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer;
-import org.eclipse.jdt.internal.ui.text.SimpleJavaSourceViewerConfiguration;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jdt.ui.text.IColorManager;
-import org.eclipse.jdt.ui.text.IJavaPartitions;
-import org.eclipse.jdt.ui.text.JavaTextTools;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.viewers.AnnotationColumnLabelProvider;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateJavaWidget extends SimpleWidgetDataContributor {
-    IStatus status = Status.OK_STATUS;
-
-    private IType type;
-    private Java2WSDataModel model;
-    private TreeViewer javaTreeViewer;
-    private SourceViewer annotationPreviewViewer;
-
-    private TreeViewerColumn webMethodViewerColumn;
-    private TreeViewerColumn webParamViewerColumn;
-    private TreeViewerColumn requestWrapperViewerColumn;
-    private TreeViewerColumn responceWrapperViewerColumn;
-    
-    public JAXWSAnnotateJavaWidget() {
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        this.model = model;
-    }
-    
-    @Override
-    public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-        SashForm sashForm = new SashForm(parent, SWT.VERTICAL | SWT.SMOOTH);
-        GridLayout gridLayout = new GridLayout(1, true);
-        sashForm.setLayout(gridLayout);
-        
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        sashForm.setLayoutData(gridData);
-        
-        Composite javaTreecomposite = new Composite(sashForm, SWT.NONE);
-        gridLayout = new GridLayout(1, true);
-        javaTreecomposite.setLayout(gridLayout);
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        javaTreecomposite.setLayoutData(gridData);
-
-        Label outlineLabel = new Label(javaTreecomposite, SWT.NONE);
-        outlineLabel.setText(CXFCreationUIMessages.JAXWS_ANNOTATE_JJAVA_WIDGET_SELECT_METHOD_TO_ANNOTATE);
-
-        Tree javaTree = new Tree(javaTreecomposite, SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL
-                | SWT.H_SCROLL);
-        javaTreeViewer = new TreeViewer(javaTree);
-
-        javaTree.setHeaderVisible(true);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.heightHint = 10;
-        gridData.widthHint = 200;
-        javaTree.setLayoutData(gridData);
-
-        TreeViewerColumn classViewerColumn = new TreeViewerColumn(javaTreeViewer, SWT.NONE);
-        TreeColumn classColumn = classViewerColumn.getColumn();
-        classColumn.setWidth(200);
-        classColumn.setMoveable(false);
-
-        final JavaElementLabelProvider javaElementLabelProvider = new JavaElementLabelProvider();
-        classViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
-            @Override
-            public Image getImage(Object element) {
-                return javaElementLabelProvider.getImage(element);
-            }
-
-            @Override
-            public String getText(Object element) {
-                return javaElementLabelProvider.getText(element);
-            }
-        });
-
-        javaTreeViewer.setContentProvider(new StandardJavaElementContentProvider(true) {
-            @Override
-            public Object[] getChildren(Object element) {
-                if (element instanceof ICompilationUnit) {
-                    try {
-                        ICompilationUnit compilationUnit = (ICompilationUnit) element;
-                        IType[] types = compilationUnit.getTypes();
-                        for (IType type : types) {
-                            if (type instanceof SourceType) {
-                                return new Object[] {type};
-                            }
-                        }
-                    } catch (JavaModelException jme) {
-                        CXFCreationUIPlugin.log(jme.getStatus());
-                    }
-                }
-
-                if (element instanceof SourceType) {
-                    try {
-                        SourceType sourceType = (SourceType) element;
-                        List<IMethod> publicMethods = new ArrayList<IMethod>();
-                        IMethod[] methods = sourceType.getMethods();
-                        if (sourceType.isInterface()) {
-                            return methods;
-                        } else if (sourceType.isClass()) {
-                            for (IMethod method : methods) {
-                                if (JDTUtils.isPublicMethod(method)) {
-                                    publicMethods.add(method);
-                                }
-                            }
-                        }
-                        return publicMethods.toArray(new Object[publicMethods.size()]);
-                    } catch (JavaModelException jme) {
-                        CXFCreationUIPlugin.log(jme.getStatus());
-                    }
-                }
-                return NO_CHILDREN;
-            }
-
-            @Override
-            public boolean hasChildren(Object element) {
-                return getChildren(element).length > 0;
-            }
-        });
-
-        javaTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-
-            public void selectionChanged(SelectionChangedEvent event) {
-                if (event.getSelection() instanceof ITreeSelection) {
-                    ITreeSelection treeSelection = (TreeSelection) event.getSelection();
-                    Object firstElement = treeSelection.getFirstElement();
-                    
-                    IDocument document = annotationPreviewViewer.getDocument();
-                    FindReplaceDocumentAdapter findReplaceDocumentAdapter = 
-                    	new FindReplaceDocumentAdapter(document);
-                    try {
-                        if (firstElement instanceof SourceType) {
-                            SourceType sourceType = (SourceType) firstElement;
-                            String elementName = sourceType.getElementName();
-                            
-                            StringBuilder regex = new StringBuilder("\\bpublic\\W+(?:\\w+\\W+){1,3}?");
-                            regex.append(elementName);
-                            regex.append("\\b");
-                            IRegion region = findReplaceDocumentAdapter.find(0, regex.toString(), true, true,
-                                    false, true);
-
-                            annotationPreviewViewer.setSelectedRange(region.getOffset(), region.getLength());
-                            annotationPreviewViewer.revealRange(region.getOffset(), region.getLength());
-                        } else if (firstElement instanceof SourceMethod) {
-                            SourceMethod sourceMethod = (SourceMethod) firstElement;
-                            SourceType sourceType = (SourceType) sourceMethod.getParent();
-                            
-                            String elementName = sourceMethod.getElementName();
-                            
-                            StringBuilder regex = new StringBuilder();
-                            
-                            if (sourceType.isClass()) {
-                                regex.append("\\bpublic");
-                            }
-                           	
-                            regex.append("\\W+(?:\\w+\\W+){1,3}?");
-                            regex.append(elementName);
-                            regex.append("\\s*?\\(\\s*?.*?");
-                           	
-                            String[] parameterTypes = sourceMethod.getParameterTypes();
-                            String[] paramterNames = sourceMethod.getParameterNames();
-                            
-                            for (int i = 0; i < parameterTypes.length; i++) {
-                                regex.append("\\s*?");
-                                String typeName = Signature.toString(parameterTypes[i]);
-                                regex.append(typeName);
-                                regex.append("\\s*?");
-                                regex.append(paramterNames[i]);
-                            	if (i < parameterTypes.length - 1) {
-                            	    regex.append("\\s*?,\\s*?.*?");
-                            	}
-							}
-                            regex.append("\\s*?\\)");
-
-                        	IRegion region = findReplaceDocumentAdapter.find(0, regex.toString(), true, true,
-                        	        false, true);
-                            
-                            if (region != null) {
-                                IRegion elementNameRegion = findReplaceDocumentAdapter.find(
-                                		region.getOffset(), elementName, true, true, true, false);
-                                if (elementNameRegion != null) {
-                                	annotationPreviewViewer.setSelectedRange(elementNameRegion.getOffset(), 
-                                    		elementNameRegion.getLength());
-                                    annotationPreviewViewer.revealRange(elementNameRegion.getOffset(), 
-                                    		elementNameRegion.getLength());
-                                }
-                            }
-                        }
-                    } catch (BadLocationException ble) {
-                        CXFCreationUIPlugin.log(ble);
-                    } catch (JavaModelException jme) {
-                        CXFCreationUIPlugin.log(jme);
-					}
-                }
-            }
-        });
-
-        createWebMethodViewerColumn(javaTreeViewer);
-        createWebParamViewerColumn(javaTreeViewer);
-        createRequestWrapperViewerColumn(javaTreeViewer);
-        createResponseWrapperViewerColumn(javaTreeViewer);
-
-        javaTreeViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
-        javaTreeViewer.expandAll();
-
-        Composite previewComposite = new Composite(sashForm, SWT.NONE);
-        gridLayout = new GridLayout(1, true);
-        previewComposite.setLayout(gridLayout);
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        javaTreecomposite.setLayoutData(gridData);
-
-        Label previewLabel = new Label(previewComposite, SWT.NONE);
-        previewLabel.setText(CXFCreationUIMessages.JAXWS_ANNOTATE_JJAVA_WIDGET_PREVIEW);
-
-        annotationPreviewViewer = createAnnotationPreviewer(previewComposite, SWT.READ_ONLY | SWT.V_SCROLL
-                | SWT.H_SCROLL | SWT.BORDER);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.heightHint = 10;
-        gridData.widthHint = 200;
-        annotationPreviewViewer.getControl().setLayoutData(gridData);
-        
-        sashForm.setWeights(new int[]{50, 50});
-        
-        return this;
-    }
-
-    @Override
-    public void internalize() {
-        type = null;
-        updateLabelProviders();
-        javaTreeViewer.setInput(getType().getTypeRoot());
-        javaTreeViewer.refresh();
-        handleAnnotation(getType());
-    }
-
-    private IType getType() {
-        if (type != null) {
-            return type;
-        }
-        if (model.getFullyQualifiedJavaInterfaceName() != null) {
-            type = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                    .getFullyQualifiedJavaInterfaceName());
-        } else if (model.getFullyQualifiedJavaClassName() != null) {
-            type =JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                    .getFullyQualifiedJavaClassName());
-        }
-        
-        if (type == null) {
-            type = JDTUtils.getType(JDTUtils.getJavaProject(model.getProjectName()), model
-                    .getJavaStartingPoint());
-        }
-        
-        model.setMethodMap(CXFModelUtils.getMethodMap(type, model));
-
-        return type;
-    }
-    
-    private TreeViewerColumn createWebMethodViewerColumn(TreeViewer treeViewer) {
-        webMethodViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
-        TreeColumn webMethodColumn = webMethodViewerColumn.getColumn();
-        webMethodColumn.setText("@" + CXFModelUtils.WEB_METHOD); //$NON-NLS-1$
-        webMethodColumn.setWidth(100);
-        webMethodColumn.setAlignment(SWT.CENTER);
-        webMethodColumn.setMoveable(false);
-        webMethodViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.WEB_METHOD, getType()));
-        webMethodViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
-                CXFModelUtils.WEB_METHOD));
-        return webMethodViewerColumn;
-    }
-
-    private TreeViewerColumn createWebParamViewerColumn(TreeViewer treeViewer) {
-        webParamViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
-        TreeColumn webParamColumn = webParamViewerColumn.getColumn();
-        webParamColumn.setText("@" + CXFModelUtils.WEB_PARAM); //$NON-NLS-1$
-        webParamColumn.setWidth(100);
-        webParamColumn.setAlignment(SWT.CENTER);
-        webParamColumn.setMoveable(false);
-        webParamViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.WEB_PARAM, getType()));
-        webParamViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
-                CXFModelUtils.WEB_PARAM));
-        return webParamViewerColumn;
-    }
-
-    private TreeViewerColumn createRequestWrapperViewerColumn(TreeViewer treeViewer) {
-        requestWrapperViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
-        TreeColumn createRequestWrapperColumn = requestWrapperViewerColumn.getColumn();
-        createRequestWrapperColumn.setText("@" + CXFModelUtils.REQUEST_WRAPPER); //$NON-NLS-1$
-        createRequestWrapperColumn.setWidth(100);
-        createRequestWrapperColumn.setMoveable(false);
-        requestWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.REQUEST_WRAPPER, getType()));
-        requestWrapperViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer, 
-                CXFModelUtils.REQUEST_WRAPPER));
-        return requestWrapperViewerColumn;
-    }
-
-    private TreeViewerColumn createResponseWrapperViewerColumn(TreeViewer treeViewer) {
-        responceWrapperViewerColumn = new TreeViewerColumn(treeViewer, SWT.CENTER);
-        TreeColumn responceWrapperColumn = responceWrapperViewerColumn.getColumn();
-        responceWrapperColumn.setText("@" + CXFModelUtils.RESPONSE_WRAPPER); //$NON-NLS-1$
-        responceWrapperColumn.setWidth(100);
-        responceWrapperColumn.setMoveable(false);
-        responceWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.RESPONSE_WRAPPER, getType()));
-        responceWrapperViewerColumn.setEditingSupport(new AnnotationEditingSupport(treeViewer,
-                CXFModelUtils.RESPONSE_WRAPPER));
-        return responceWrapperViewerColumn;
-    }
-    
-    private void updateLabelProviders() {
-        webMethodViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.WEB_METHOD, getType()));
-        webParamViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.WEB_PARAM, getType()));
-        requestWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.REQUEST_WRAPPER, getType()));
-        responceWrapperViewerColumn.setLabelProvider(new AnnotationColumnLabelProvider(model,
-                CXFModelUtils.RESPONSE_WRAPPER, getType()));
-    }
-    
-    private void handleAnnotation(IType type) {
-        try {
-            annotationPreviewViewer.setRedraw(false);
-
-            ICompilationUnit compilationUnit = type.getCompilationUnit();
-            IProgressMonitor monitor =  new NullProgressMonitor();
-            
-            TextFileChange textFileChange = new TextFileChange("Annotation Changes", 
-                    (IFile)compilationUnit.getResource());
-            MultiTextEdit multiTextEdit = new MultiTextEdit();
-            textFileChange.setEdit(multiTextEdit);
-            textFileChange.setKeepPreviewEdits(true);
-//            compositeChange.setSaveMode(TextFileChange.FORCE_SAVE);
-
-            CXFModelUtils.getWebServiceAnnotationChange(type, model, textFileChange);
-
-            IMethod[] typeMethods = JDTUtils.getPublicMethods(type);
-            for (int i = 0; i < typeMethods.length; i++) {
-                IMethod method = typeMethods[i];
-                Map<String, Boolean> methodAnnotationMap = model.getMethodMap().get(method);
-                if (methodAnnotationMap.get(CXFModelUtils.WEB_METHOD)) {
-                    CXFModelUtils.getWebMethodAnnotationChange(type, method, textFileChange);
-                }
-                if (methodAnnotationMap.get(CXFModelUtils.REQUEST_WRAPPER)) {
-                    CXFModelUtils.getRequestWrapperAnnotationChange(type, method, textFileChange);
-                }
-                if (methodAnnotationMap.get(CXFModelUtils.RESPONSE_WRAPPER)) {
-                    CXFModelUtils.getResponseWrapperAnnotationChange(type, method, textFileChange);
-                }
-                if (methodAnnotationMap.get(CXFModelUtils.WEB_PARAM)) {
-                    List<SingleVariableDeclaration> parameters = AnnotationUtils.getMethodParameters(
-                            type, method);
-                    for (SingleVariableDeclaration parameter : parameters) {
-                        CXFModelUtils.getWebParamAnnotationChange(type, method, parameter, textFileChange);
-                    }
-                } 
-            }
-            
-            CXFModelUtils.getImportsChange(compilationUnit, model, textFileChange, false);
-            annotationPreviewViewer.getDocument().set(textFileChange.getPreviewContent(monitor));
-
-            annotationPreviewViewer.setRedraw(true);
-        } catch (CoreException ce) {
-            CXFCreationUIPlugin.log(ce.getStatus());
-        } catch (MalformedTreeException mte) {
-            CXFCreationUIPlugin.log(mte);
-        } 
-    }
-
-    private SourceViewer createAnnotationPreviewer(Composite parent, int styles) {
-        JavaPlugin javaPlugin = JavaPlugin.getDefault();
-        IPreferenceStore store = javaPlugin.getCombinedPreferenceStore();
-        JavaTextTools javaTextTools = javaPlugin.getJavaTextTools();
-        annotationPreviewViewer = new JavaSourceViewer(parent, null, null, true, styles, store);
-        IColorManager colorManager = javaTextTools.getColorManager();
-        SimpleJavaSourceViewerConfiguration configuration = new SimpleJavaSourceViewerConfiguration(
-                colorManager, store, null, IJavaPartitions.JAVA_PARTITIONING, true);
-
-        annotationPreviewViewer.configure(configuration);
-
-        Font font = JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT);
-        annotationPreviewViewer.getTextWidget().setFont(font);
-        annotationPreviewViewer.setEditable(false);
-
-
-        String source = JDTUtils.getSourceFromType(getType());
-        IDocument document = new Document(source);
-
-        JavaPlugin.getDefault().getJavaTextTools().setupJavaDocumentPartitioner(document,
-                IJavaPartitions.JAVA_PARTITIONING);
-        annotationPreviewViewer.setDocument(document);
-
-        return annotationPreviewViewer;
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return status;
-    }
-
-    private class AnnotationEditingSupport extends EditingSupport {
-        private CheckboxCellEditor checkboxCellEditor;
-
-        private String annotationKey;
-        
-        public AnnotationEditingSupport(TreeViewer viewer, String annotationKey) {
-            super(viewer);
-            this.annotationKey = annotationKey;
-            checkboxCellEditor = new CheckboxCellEditor(viewer.getTree());
-        }
-
-        @Override
-        protected boolean canEdit(Object element) {
-            return !AnnotationUtils.isAnnotationPresent(type.findMethods((IMethod) element)[0], 
-                    annotationKey);
-        }
-
-        @Override
-        protected CellEditor getCellEditor(Object element) {
-            return checkboxCellEditor;
-        }
-
-        @Override
-        protected Object getValue(Object element) {
-            Boolean annotate = model.getMethodMap().get(element).get(annotationKey);
-            return annotate;
-        }
-
-        @Override
-        protected void setValue(Object element, Object value) {
-            if (element instanceof SourceMethod) {
-                SourceMethod method = (SourceMethod) element;
-                Boolean annotate = (Boolean) value;
-                Map<String, Boolean> annotationMap = model.getMethodMap().get(element);
-                annotationMap.put(annotationKey, annotate);
-                handleAnnotation(method.getDeclaringType());
-                getViewer().refresh(true);
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java
deleted file mode 100644
index 0fe60c3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/JAXWSAnnotateWidgetFactory.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-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.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class JAXWSAnnotateWidgetFactory implements INamedWidgetContributorFactory {
-    private SimpleWidgetContributor jaxwsAnnotateWidgetContributor;
-
-    private JAXWSAnnotateJavaWidget jaxwsAnnotateJavaWidget = new JAXWSAnnotateJavaWidget();
-    
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if (jaxwsAnnotateWidgetContributor == null) {
-            init();
-        }
-        return jaxwsAnnotateWidgetContributor;
-    }
-
-    public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-        return null;
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(Java2WSDefaultingCommand.class,
-                "Java2WSDataModel", JAXWSAnnotateWidgetFactory.class); //$NON-NLS-1$
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        jaxwsAnnotateJavaWidget.setJava2WSDataModel(model);
-    }
-
-    private void init() {
-        jaxwsAnnotateWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        String title = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.JAVA2WS_JAXWS_ANNOTATE_PAGE_TITLE, 
-                new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        jaxwsAnnotateWidgetContributor.setTitle(title);
-        jaxwsAnnotateWidgetContributor
-                .setDescription(CXFCreationUIMessages.JAVA2WS_JAXWS_ANNOTATE_PAGE_DESCRIPTION);
-        jaxwsAnnotateWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return jaxwsAnnotateJavaWidget;
-            }
-        });
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java
deleted file mode 100644
index 3751763..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSClassConfigWidget.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-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.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.Listener;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSClassConfigWidget extends SimpleWidgetDataContributor {
-    private IStatus JAVA_TYPE_NAME_STATUS = Status.OK_STATUS;
-    private IStatus JAVA_TYPE_EXISTS_STATUS = Status.OK_STATUS;
-    private IStatus SEI_SELECTION_STATUS = Status.OK_STATUS;
-
-    private int NUMBER_OF_PUBLIC_METHODS;
-    private int NUMBER_OF_CHECKED_METHODS;
-    private IMethod[] publicMethods;
-
-    private Button useSEIButton;
-    private Button selectSEIButton;
-    private Button extractSEIButton;
-
-    private Combo selectSEICombo;
-    private Text seiInterfaceNameText;
-    
-    private CheckboxTableViewer seiMembersToExtractTableViewer;
-    private Table seiMembersToExtractTable;
-    private Button selectAllButton;
-    private Button deselectAllButton;
-
-    private Java2WSDataModel model;
-    private IType startingPointType;
-
-    public Java2WSClassConfigWidget() {
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    public void setJavaStartingPointType(IType startingPointType) {
-        this.startingPointType = startingPointType;
-    }
-
-    @Override
-    public void internalize() {
-        useSEIButton.setSelection(false);
-        selectSEIButton.setSelection(false);
-        selectSEIButton.setEnabled(false);
-        enableSelectSEIControls(false);
-        extractSEIButton.setSelection(false);
-        extractSEIButton.setEnabled(false);
-        enableExtractSEIControls(false);
-        seiInterfaceNameText.setText("");
-        seiMembersToExtractTableViewer.setAllChecked(false);
-        NUMBER_OF_CHECKED_METHODS = 0;
-    }
-
-    @Override
-    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) {
-        final Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(3, false);
-        composite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        composite.setLayoutData(gridData);
-
-        useSEIButton = Java2WSWidgetFactory.createUseSEIButton(composite);
-        useSEIButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                boolean useSEI = useSEIButton.getSelection();
-                model.setUseServiceEndpointInterface(useSEI);
-                selectSEIButton.setEnabled(useSEI);
-                extractSEIButton.setEnabled(useSEI);
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-                if (!useSEI) {
-                    selectSEIButton.setSelection(false);
-                    enableSelectSEIControls(false);
-
-                    extractSEIButton.setSelection(false);
-                    enableExtractSEIControls(false);
-                }
-            }
-
-        });
-        gridData = new GridData(SWT.FILL, SWT.CENTER, true, true);
-        gridData.horizontalSpan = 3;
-        useSEIButton.setLayoutData(gridData);
-
-        Label infoLabel = Java2WSWidgetFactory.createInformationLabel(composite, startingPointType);
-        gridData = new GridData(SWT.FILL, SWT.CENTER, false, false);
-        gridData.horizontalSpan = 3;
-        gridData.widthHint = 100;
-        infoLabel.setLayoutData(gridData);
-
-        Label paddingLabel = Java2WSWidgetFactory.createPaddingLabel(composite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        paddingLabel.setLayoutData(gridData);
-
-        selectSEIButton = Java2WSWidgetFactory.createSelectSEIButton(composite);
-        selectSEIButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                enableSelectSEIControls(selectSEIButton.getSelection());
-                enableExtractSEIControls(!selectSEIButton.getSelection());
-                if (selectSEIButton.getSelection() && selectSEICombo.getSelectionIndex() != -1) {
-                    model.setFullyQualifiedJavaInterfaceName(selectSEICombo.getText());
-                }
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-        });
-        selectSEIButton.setSelection(false);
-        selectSEIButton.setEnabled(false);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        selectSEIButton.setLayoutData(gridData);
-
-        selectSEICombo = Java2WSWidgetFactory.createSelectSEICombo(composite, model, startingPointType);
-        selectSEICombo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-        });
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        selectSEICombo.setLayoutData(gridData);
-
-        paddingLabel = Java2WSWidgetFactory.createPaddingLabel(composite);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        paddingLabel.setLayoutData(gridData);
-
-        extractSEIButton = Java2WSWidgetFactory.createExtractSEIButton(composite);
-        extractSEIButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                boolean extract = extractSEIButton.getSelection();
-                model.setExtractInterface(extract);
-                enableExtractSEIControls(extract);
-                enableSelectSEIControls(!extract);
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-        });
-        extractSEIButton.setSelection(model.isExtractInterface());
-        extractSEIButton.setEnabled(false);
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        extractSEIButton.setLayoutData(gridData);
-        
-        seiInterfaceNameText = Java2WSWidgetFactory.createSEIInterfaceNameText(composite);
-        seiInterfaceNameText.addModifyListener(new ModifyListener() {
-
-            public void modifyText(ModifyEvent event) {
-                String interfaceName = seiInterfaceNameText.getText();
-                model.setServiceEndpointInterfaceName(interfaceName);
-
-                String compilationUnitName = interfaceName + ".java"; //$NON-NLS-1$
-                JAVA_TYPE_NAME_STATUS = JDTUtils.validateJavaTypeName(model.getProjectName(), interfaceName);
-                JAVA_TYPE_EXISTS_STATUS = JDTUtils.checkTypeExists(startingPointType, compilationUnitName);
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-        });
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        seiInterfaceNameText.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createPaddingLabel(composite);
-
-        Java2WSWidgetFactory.createMemebersToExtractLabel(composite);
-
-        Java2WSWidgetFactory.createPaddingLabel(composite);
-        Java2WSWidgetFactory.createPaddingLabel(composite);
-
-        seiMembersToExtractTableViewer = Java2WSWidgetFactory
-                .createSEIMembersToExtractTableViewer(composite);
-        seiMembersToExtractTable = seiMembersToExtractTableViewer.getTable();
-        seiMembersToExtractTableViewer.addCheckStateListener(new ICheckStateListener() {
-
-            public void checkStateChanged(CheckStateChangedEvent event) {
-                Object[] checkedMethods = seiMembersToExtractTableViewer.getCheckedElements();
-                
-                Map<IMethod, Map<String, Boolean>> methodMap = new HashMap<IMethod, Map<String, Boolean>>();
-                for (int i = 0; i < checkedMethods.length; i++) {
-                    methodMap.put((IMethod)checkedMethods[i], model.getAnnotationMap());
-                }
-                model.setMethodMap(methodMap);
-
-                NUMBER_OF_CHECKED_METHODS = checkedMethods.length;
-
-                if (NUMBER_OF_CHECKED_METHODS < NUMBER_OF_PUBLIC_METHODS) {
-                    selectAllButton.setEnabled(true);
-                } else if (NUMBER_OF_CHECKED_METHODS == NUMBER_OF_PUBLIC_METHODS) {
-                    selectAllButton.setEnabled(false);
-                }
-
-                if (NUMBER_OF_CHECKED_METHODS > 0) {
-                    deselectAllButton.setEnabled(true);
-                } else {
-                    deselectAllButton.setEnabled(false);
-                }
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-        });
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.verticalSpan = 3;
-        gridData.heightHint = 100;
-        seiMembersToExtractTable.setLayoutData(gridData);
-
-        selectAllButton = Java2WSWidgetFactory.createSelectAllButton(composite);
-        selectAllButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                seiMembersToExtractTableViewer.setAllChecked(true);
-                selectAllButton.setEnabled(false);
-                deselectAllButton.setEnabled(true);
-
-                TableItem[] checkedMethods = seiMembersToExtractTableViewer.getTable().getItems();
-                for (int i = 0; i < checkedMethods.length; i++) {
-                    TableItem tableItem = checkedMethods[i];
-                    SelectionEvent selectionEvent = event;
-                    selectionEvent.detail = SWT.CHECK;
-                    selectionEvent.item = tableItem;
-                    seiMembersToExtractTableViewer.handleSelect(selectionEvent);
-                }
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-
-        });
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        selectAllButton.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createPaddingLabel(composite);
-
-        deselectAllButton = Java2WSWidgetFactory.createDeselectAllButton(composite);
-        deselectAllButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                seiMembersToExtractTableViewer.setAllChecked(false);
-                selectAllButton.setEnabled(true);
-                deselectAllButton.setEnabled(false);
-
-                TableItem[] checkedMethods = seiMembersToExtractTableViewer.getTable().getItems();
-                for (int i = 0; i < checkedMethods.length; i++) {
-                    TableItem tableItem = checkedMethods[i];
-                    SelectionEvent selectionEvent = event;
-                    selectionEvent.detail = SWT.CHECK;
-                    selectionEvent.item = tableItem;
-                    seiMembersToExtractTableViewer.handleSelect(selectionEvent);
-                }
-
-                updateSEISelectionStatus();
-                statusListener.handleEvent(null);
-            }
-
-        });
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        deselectAllButton.setLayoutData(gridData);
-
-        publicMethods = JDTUtils.getPublicMethods(startingPointType);
-        NUMBER_OF_PUBLIC_METHODS = publicMethods.length;
-        seiMembersToExtractTableViewer.setInput(publicMethods);
-
-        enableSelectSEIControls(false);
-        enableExtractSEIControls(false);
-        selectAllButton.setEnabled(false);
-        deselectAllButton.setEnabled(false);
-
-        return this;
-    }
-
-    public void enableSelectSEIControls(boolean enable) {
-        selectSEICombo.setEnabled(enable);
-    }
-
-    public void enableExtractSEIControls(boolean enable) {
-        seiInterfaceNameText.setEnabled(enable);
-        seiMembersToExtractTable.setEnabled(enable);
-        if (enable && (NUMBER_OF_CHECKED_METHODS < NUMBER_OF_PUBLIC_METHODS)) {
-            selectAllButton.setEnabled(true);
-        }
-
-        if (enable && (NUMBER_OF_CHECKED_METHODS > 0)) {
-            deselectAllButton.setEnabled(true);
-        }
-
-        if (!enable) {
-            selectAllButton.setEnabled(false);
-            deselectAllButton.setEnabled(false);
-        }
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return findMostSevere();
-    }
-
-    private void updateSEISelectionStatus() {
-        if (useSEIButton.getSelection()) {
-            if (!selectSEIButton.getSelection() && !extractSEIButton.getSelection()) {
-                SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-                        CXFCreationUIMessages.JAVA2WS_SELECT_SEI_OPTION);
-            }
-
-            if (selectSEIButton.getSelection() && selectSEICombo.getText().length() == 0) {
-                SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-                        CXFCreationUIMessages.JAVA2WS_SELECT_SEI_FROM_TYPE_HIERARCHY);
-            } else if (selectSEIButton.getSelection() && selectSEICombo.getText().length() > 0) {
-                SEI_SELECTION_STATUS = Status.OK_STATUS;
-            }
-
-            if (extractSEIButton.getSelection() && seiInterfaceNameText.getText().trim().length() == 0) {
-                SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-                        CXFCreationUIMessages.JAVA2WS_ENTER_SEI_NAME);
-            } else if (extractSEIButton.getSelection() && NUMBER_OF_PUBLIC_METHODS > 0
-                    && NUMBER_OF_CHECKED_METHODS == 0) {
-                SEI_SELECTION_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-                        CXFCreationUIMessages.bind(
-                                CXFCreationUIMessages.JAVA2WS_SELECT_SEI_EXTRACTED_METHODS,
-                                startingPointType.getElementName()));
-            } else if (extractSEIButton.getSelection() && seiInterfaceNameText.getText().trim().length() > 0
-                    && NUMBER_OF_PUBLIC_METHODS > 0 && NUMBER_OF_CHECKED_METHODS > 0) {
-                SEI_SELECTION_STATUS = Status.OK_STATUS;
-            }
-
-        } else {
-            SEI_SELECTION_STATUS = Status.OK_STATUS;
-            JAVA_TYPE_NAME_STATUS = Status.OK_STATUS;
-            JAVA_TYPE_EXISTS_STATUS = Status.OK_STATUS;
-        }
-    }
-
-    private IStatus findMostSevere() {
-        if (JAVA_TYPE_NAME_STATUS.matches(IStatus.ERROR)) {
-            return JAVA_TYPE_NAME_STATUS;
-        }
-        if (JAVA_TYPE_EXISTS_STATUS.matches(IStatus.ERROR)) {
-            return JAVA_TYPE_EXISTS_STATUS;
-        }
-        if (SEI_SELECTION_STATUS.matches(IStatus.ERROR)) {
-            return SEI_SELECTION_STATUS;
-        }
-        
-        if (SEI_SELECTION_STATUS.getSeverity() >= JAVA_TYPE_NAME_STATUS.getSeverity()) {
-            return SEI_SELECTION_STATUS;
-        }
-
-        if (JAVA_TYPE_EXISTS_STATUS.getSeverity() >= JAVA_TYPE_NAME_STATUS.getSeverity()) {
-            return JAVA_TYPE_EXISTS_STATUS;
-        }
-
-        return JAVA_TYPE_NAME_STATUS;    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java
deleted file mode 100644
index e8ae622..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidget.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.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.Group;
-import org.eclipse.swt.widgets.Listener;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSConfigWidget extends SimpleWidgetDataContributor {
-    private IStatus WSDL_FILENAME_OK_STATUS = Status.OK_STATUS;
-    private IStatus WSDL_FILENAME_ERROR_STATUS = new Status(IStatus.ERROR, CXFCreationUIPlugin.PLUGIN_ID,
-            CXFCreationUIMessages.JAVA2WS_ENTER_VALID_WSDL_NAME);
-
-    private Button generateClientButton;
-    private Button generateServerButton;
-    private Button generateWraperFaultBeansButton;
-    private Button generateWSDLButton;
-    private Combo soapBindingCombo;
-    private Button createXSDImports;
-    private Text wsdlFileText;
-    private Java2WSDataModel model;
-
-    public Java2WSConfigWidget() {
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        this.model = model;
-    }
-    
-    @Override
-    public void internalize() {
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            generateClientButton.setSelection(model.isGenerateClient());
-            generateServerButton.setSelection(model.isGenerateServer());
-            generateWraperFaultBeansButton.setSelection(model.isGenerateWrapperFaultBeans());
-            generateWSDLButton.setSelection(model.isGenerateWSDL());
-            enableWSDLGroup(model.isGenerateWSDL());
-        }
-        if (model.isSoap12Binding()) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
-        }
-        createXSDImports.setSelection(model.isGenerateXSDImports());
-    }
-
-    @Override
-    public WidgetDataEvents addControls(Composite parent, final Listener statusListener) {
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(2, false);
-        composite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        composite.setLayoutData(gridData);
-
-        Group java2wsGroup = null;
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            // Frontend
-//            Java2WSWidgetFactory.createFrontendLabel(composite);
-//
-//            final Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(composite, model);
-//            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-//            frontendCombo.setLayoutData(gridData);
-    
-            // Java2WS Group
-            java2wsGroup = new Group(composite, SWT.SHADOW_IN);
-            java2wsGroup.setText(CXFCreationUIMessages.JAVA2WS_GROUP_LABEL);
-            GridLayout java2wslayout = new GridLayout();
-    
-            java2wslayout.numColumns = 3;
-    
-            java2wslayout.marginHeight = 10;
-            java2wsGroup.setLayout(java2wslayout);
-            gridData = new GridData(GridData.FILL_HORIZONTAL);
-            gridData.horizontalSpan = 2;
-            java2wsGroup.setLayoutData(gridData);
-    
-            // Gen Client
-            generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, model);
-
-            // Gen Server
-            generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, model);
-    
-            // Gen Wrapper and Fault Bean
-            generateWraperFaultBeansButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
-                    java2wsGroup, model);
-    
-            // Gen WSDL
-            generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, model);
-            generateWSDLButton.addSelectionListener(new SelectionAdapter() {
-                public void widgetSelected(SelectionEvent e) {
-                    enableWSDLGroup(generateWSDLButton.getSelection());
-                }
-            });
-            gridData = new GridData(GridData.FILL_HORIZONTAL);
-            gridData.horizontalSpan = 3;
-            generateWSDLButton.setLayoutData(gridData);
-        }
-        
-        Group wsdlGroup = new Group(java2wsGroup == null ? composite : java2wsGroup, SWT.SHADOW_ETCHED_IN);
-        GridLayout wsdlGroupLayout = new GridLayout(2, false);
-        wsdlGroup.setLayout(wsdlGroupLayout);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 3;
-        wsdlGroup.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createWSDLFileNameLabel(wsdlGroup);
-
-        wsdlFileText = Java2WSWidgetFactory.createWSDLFileNameText(wsdlGroup, model);
-        wsdlFileText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                statusListener.handleEvent(null);
-            }
-        });
-
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdlFileText.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
-        soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        soapBindingCombo.setLayoutData(gridData);
-
-        createXSDImports = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        createXSDImports.setLayoutData(gridData);
-
-        enableWSDLGroup(model.isGenerateWSDL());
-
-        return this;
-    }
-
-    private void enableWSDLGroup(boolean enable) {
-        wsdlFileText.setEnabled(enable);
-        soapBindingCombo.setEnabled(enable);
-        createXSDImports.setEnabled(enable);
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return getWSDLFileNameStatus();
-    }
-
-    private IStatus getWSDLFileNameStatus() {
-        IStatus status = WSDL_FILENAME_OK_STATUS;
-        String wsdlFileName = wsdlFileText.getText();
-        if (!WSDLUtils.isValidWSDLFileName(wsdlFileName)) {
-            status = WSDL_FILENAME_ERROR_STATUS;
-        }
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.java
deleted file mode 100644
index 49dab35..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSConfigWidgetFactory.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.creation.ui.widgets;
-
-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.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-    private SimpleWidgetContributor java2WSWidgetContributor;
-
-    private Java2WSConfigWidget java2WSConfigWidget = new Java2WSConfigWidget();
-    
-    public Java2WSConfigWidgetFactory() {
-
-    }
-
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if (java2WSWidgetContributor == null) {
-            init();
-        }
-        return java2WSWidgetContributor;
-    }
-
-    public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-        return null;
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(Java2WSDefaultingCommand.class,
-                "Java2WSDataModel", Java2WSConfigWidgetFactory.class); //$NON-NLS-1$
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        java2WSConfigWidget.setJava2WSDataModel(model);
-    }
-
-    private void init() {
-        java2WSWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        String title = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.JAVA2WS_PAGE_TITLE, new Object[]{context.getCxfRuntimeEdition(), 
-                        context.getCxfRuntimeVersion()});
-
-        java2WSWidgetContributor.setTitle(title);
-        java2WSWidgetContributor
-                .setDescription(CXFCreationUIMessages.JAVA2WS_PAGE_DESCRIPTION);
-        java2WSWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return java2WSConfigWidget;
-            }
-        });
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java
deleted file mode 100644
index 8c00bad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSInterfaceConfigWidget.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSWidgetFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-/**
- * 
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class Java2WSInterfaceConfigWidget extends SimpleWidgetDataContributor {
-    private Java2WSDataModel model;
-    private IType startingPointType;
-
-    public Java2WSInterfaceConfigWidget() {
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        this.model = model;
-    }
-
-    public void setJavaStartingPointType(IType startingPointType) {
-        this.startingPointType = startingPointType;
-    }
-
-    @Override
-    public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-        final Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout gridLayout = new GridLayout(2, false);
-        composite.setLayout(gridLayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        composite.setLayoutData(gridData);
-        
-        Java2WSWidgetFactory.createSelectImplementationLabel(composite);
-        
-        Combo selectImplementationCombo = Java2WSWidgetFactory
-            .createSelectImplementationCombo(composite, model, startingPointType);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        selectImplementationCombo.setLayoutData(gridData);
-        /*
-        CLabel underConstructionLabel = new CLabel(composite, SWT.NONE);
-        gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
-        underConstructionLabel.setLayoutData(gridData);
-        underConstructionLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
-                ISharedImages.IMG_OBJS_INFO_TSK));
-        underConstructionLabel.setText("Under Construction");
-        */
-        return this;
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java
deleted file mode 100644
index 29f797f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/Java2WSSelectSEIWidgetFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIPlugin;
-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;
-
-/**
- * 
- * @author sclarke
- * 
- */
-@SuppressWarnings("restriction")
-public class Java2WSSelectSEIWidgetFactory implements INamedWidgetContributorFactory {
-    private SimpleWidgetContributor classWidgetContributor;
-    private SimpleWidgetContributor interfaceWidgetContributor;
-    
-    private Java2WSClassConfigWidget java2WSClassConfigWidget = new Java2WSClassConfigWidget();
-    private Java2WSInterfaceConfigWidget java2WSInterfaceConfigWidget = new Java2WSInterfaceConfigWidget();
-
-    private IType startingPointType;
-
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if (startingPointType == null) {
-            return null;
-        }
-        
-        if (interfaceWidgetContributor == null || classWidgetContributor == null) {
-            init();
-        }
-
-        try {
-            if (startingPointType.isInterface()) {
-                return interfaceWidgetContributor;
-            } else if (startingPointType.isClass()) {
-                return classWidgetContributor;
-            }
-        } catch (JavaModelException jme) {
-            CXFCreationUIPlugin.log(jme.getStatus());
-        }
-
-        return null;
-    }
-
-    public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-        return null;
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(Java2WSDefaultingCommand.class,
-                "Java2WSDataModel", Java2WSSelectSEIWidgetFactory.class); //$NON-NLS-1$
-        dataRegistry.addMapping(Java2WSDefaultingCommand.class,
-                "JavaStartingPointType", Java2WSSelectSEIWidgetFactory.class); //$NON-NLS-1$
-    }
-
-    public void setJava2WSDataModel(Java2WSDataModel model) {
-        java2WSClassConfigWidget.setJava2WSDataModel(model);
-        java2WSInterfaceConfigWidget.setJava2WSDataModel(model);
-    }
-
-    public void setJavaStartingPointType(IType startingPointType) {
-        this.startingPointType = startingPointType;
-        java2WSClassConfigWidget.setJavaStartingPointType(startingPointType);
-        java2WSInterfaceConfigWidget.setJavaStartingPointType(startingPointType);
-    }
-
-    private void init() {
-        classWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-        String classConfigTitle = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.JAVA2WS_CLASS_CONFIG_PAGE_TITLE, 
-                new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        classWidgetContributor.setTitle(classConfigTitle);
-        classWidgetContributor
-                .setDescription(CXFCreationUIMessages.JAVA2WS_CLASS_CONFIG_PAGE_DESCRIPTION);
-        classWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return java2WSClassConfigWidget;
-            }
-        });
-
-        interfaceWidgetContributor = new SimpleWidgetContributor();
-        String interfaceConfigTitle = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.JAVA2WS_INTERFACE_CONFIG_PAGE_TITLE,
-                new Object[]{context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        interfaceWidgetContributor.setTitle(interfaceConfigTitle);
-        interfaceWidgetContributor
-                .setDescription(CXFCreationUIMessages.JAVA2WS_INTERFACE_CONFIG_PAGE_DESCRIPTION);
-        interfaceWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return java2WSInterfaceConfigWidget;
-            }
-        });
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java
deleted file mode 100644
index 3df308e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidget.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaConfigWidget extends SimpleWidgetDataContributor {
-    private IStatus status = Status.OK_STATUS;
-    private Composite parent;
-    private Listener statusListener;
-
-    private WSDL2JavaDataModel model;
-    
-    private Combo outputDirCombo;
-    private Text packageNameText;
-    private Button namespaceMappingButton;
-    private TableViewer packageNameTableViewer;
-    private Combo serviceNameCombo;
-    private List bindingFilesList;
-    
-    private Composite namespaceCompositeHolder;
-    private Composite namespaceComposite;
-    private int namespaceCompositeHeight = -1;
-
-    public WSDL2JavaConfigWidget() {
-    }
-    
-    public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
-        this.model = model;
-    }
-    
-    @Override
-    public void internalize() {
-        WSDL2JavaWidgetFactory.populateOutputDirectoryCombo(outputDirCombo, model.getProjectName());
-        packageNameText.setText(model.getIncludedNamespaces().get(model.getTargetNamespace()));
-        namespaceMappingButton.setSelection(false);
-        expandNamespaceComposite(false);
-        if (packageNameTableViewer != null && packageNameTableViewer.getContentProvider() != null) {
-            packageNameTableViewer.setInput(model.getWsdlDefinition());
-        }
-        WSDL2JavaWidgetFactory.populateServiceNameCombo(serviceNameCombo, model);
-
-        bindingFilesList.removeAll();
-    }
-
-    @Override
-    public WidgetDataEvents addControls(final Composite parent, final Listener statusListener) {
-        this.parent = parent;
-        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);
-
-        outputDirCombo = WSDL2JavaWidgetFactory.createOutputDirectoryCombo(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        outputDirCombo.setLayoutData(gridData);
-
-        // Package Name:
-        WSDL2JavaWidgetFactory.createPackageNameLabel(mainComposite);
-
-        packageNameText = WSDL2JavaWidgetFactory.createPackageNameText(mainComposite, model);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        packageNameText.setLayoutData(gridData);
-
-        packageNameText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                String packageName = packageNameText.getText();
-                status = JDTUtils.validatePackageName(model.getProjectName(), packageName);
-                statusListener.handleEvent(null);
-            }
-        });
-
-        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) {
-                expandNamespaceComposite(namespaceMappingButton.getSelection());
-            }
-        });
-
-        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);
-
-        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);
-
-        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;
-    }
-
-    private void expandNamespaceComposite(boolean expand) {
-        if (expand) {
-            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);
-            }
-        }
-    }
-    
-    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;
-    }
-
-    private Table createNamespaceMappingTable(Composite parent) {
-        packageNameTableViewer = new TableViewer(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER
-                | SWT.FULL_SELECTION);
-
-        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 = packageNameTable.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;
-    }
-
-    @Override
-    public IStatus getStatus() {
-        return status;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java
deleted file mode 100644
index dea3210..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaConfigWidgetFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-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.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.ui.CXFCreationUIMessages;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-    private SimpleWidgetContributor wsdl2JavaWidgetContributor;
-    private SimpleWidgetContributor wsdl2JavaDefaultsWidgetContributor;
-
-    private WSDL2JavaConfigWidget wsdl2JavaConfigWidget = new WSDL2JavaConfigWidget();
-    private WSDL2JavaDefaultsConfigWidget wsdl2JavaDefaultsConfigWidget = new WSDL2JavaDefaultsConfigWidget();
-    
-    public INamedWidgetContributor getFirstNamedWidget() {
-        if ((wsdl2JavaWidgetContributor == null || wsdl2JavaDefaultsWidgetContributor == null)) {
-            init();
-        }
-        return wsdl2JavaWidgetContributor;
-    }
-
-    public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-        if (widgetContributor == wsdl2JavaWidgetContributor) {
-            return wsdl2JavaDefaultsWidgetContributor;
-        }
-        return null;
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(WSDL2JavaDefaultingCommand.class,
-                "WSDL2JavaDataModel", WSDL2JavaConfigWidgetFactory.class); //$NON-NLS-1$
-    }
-
-    public void setWSDL2JavaDataModel(WSDL2JavaDataModel model) {
-        wsdl2JavaConfigWidget.setWSDL2JavaDataModel(model);
-        wsdl2JavaDefaultsConfigWidget.setWSDL2JavaDataModel(model);
-    }
-
-    private void init() {
-        wsdl2JavaWidgetContributor = new SimpleWidgetContributor();
-        CXFContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-        String wsdl2JavaPageTitle = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.WSDL2JAVA_PAGE_TITLE, new Object[]{context.getCxfRuntimeEdition(),
-                        context.getCxfRuntimeVersion()});
-        wsdl2JavaWidgetContributor.setTitle(wsdl2JavaPageTitle);
-        wsdl2JavaWidgetContributor
-                .setDescription(CXFCreationUIMessages.WSDL2JAVA_PAGE_DESCRIPTION);
-        wsdl2JavaWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaConfigWidget;
-            }
-        });
-
-        wsdl2JavaDefaultsWidgetContributor = new SimpleWidgetContributor();
-        String wsdl2JavaDefaultsPageTitle = CXFCreationUIMessages.bind(
-                CXFCreationUIMessages.WSDL2JAVA_DEFAULTS_PAGE_TITLE, new Object[]{
-                        context.getCxfRuntimeEdition(), context.getCxfRuntimeVersion()});
-        wsdl2JavaDefaultsWidgetContributor.setTitle(wsdl2JavaDefaultsPageTitle);
-        wsdl2JavaDefaultsWidgetContributor
-                .setDescription(CXFCreationUIMessages.WSDL2JAVA_DEFAULTS_PAGE_DESCRIPTION);
-        wsdl2JavaDefaultsWidgetContributor.setFactory(new WidgetContributorFactory() {
-            public WidgetContributor create() {
-                return wsdl2JavaDefaultsConfigWidget;
-            }
-        });
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java
deleted file mode 100644
index c0d8ab8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaDefaultsConfigWidget.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-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.creation.ui.CXFCreationUIMessages;
-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;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaDefaultsConfigWidget extends SimpleWidgetDataContributor {
-    private WSDL2JavaDataModel model;
-    
-    public WSDL2JavaDefaultsConfigWidget() {
-    }
-    
-    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(CXFCreationUIMessages.WSDL2JAVA_GROUP_LABEL);
-        GridLayout wsdl2javalayout = new GridLayout(1, true);
-        wsdl2javaGroup.setLayout(wsdl2javalayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdl2javaGroup.setLayoutData(gridData);
-
-        WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, model);
-        WSDL2JavaWidgetFactory.createGenerateImplementationButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(wsdl2javaGroup, model);
-
-        if (CXFModelUtils.isAutoNameResolutionPermitted()) {
-            WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, model);
-        }
-
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, model);
-        }
-        
-        Group xjcArgGroup = new Group(mainComposite, SWT.SHADOW_IN);
-        xjcArgGroup.setText(CXFCreationUIMessages.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.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java
deleted file mode 100644
index 1d2df91..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/widgets/WSDL2JavaProjectSelectionWidgetFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand;
-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;
-
-/**
- * This is stop gap workaround for bugs <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243286">#243286</a>
- * and <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=243290">#243290</a>
- * <p>
- * Used in conjunction with <code>WSDL2JavaProjectSelectionCommand</code>
- * 
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class WSDL2JavaProjectSelectionWidgetFactory implements INamedWidgetContributorFactory {
-
-	public INamedWidgetContributor getFirstNamedWidget() {
-		return null;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget(INamedWidgetContributor widgetContributor) {
-		return null;
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "InitialProject",  //$NON-NLS-1$
-				WSDL2JavaProjectSelectionCommand.class);
-	    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject",  //$NON-NLS-1$
-	    		WSDL2JavaProjectSelectionCommand.class, "ServerProject", new StringToIProjectTransformer()); //$NON-NLS-1$
-	    dataRegistry.addMapping(ServerWizardWidget.class, "Project", WSDL2JavaProjectSelectionCommand.class); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.java
deleted file mode 100644
index 0ee3814..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebService.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.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFFactory;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.CXFDeployCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.JAXWSAnnotateJavaCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSSelectSEICommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.Java2WSValidateInputCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaDefaultingCommand;
-import org.eclipse.jst.ws.internal.cxf.creation.core.commands.WSDL2JavaProjectSelectionCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFWebService extends AbstractWebService {
-
-    public CXFWebService(WebServiceInfo info) {
-        super(info);
-    }
-
-    @Override
-    public ICommandFactory assemble(IEnvironment environment, IContext ctx, ISelection selection, 
-            String projectName, String earProject) {
-        return null;
-    }
-
-    @Override
-    public ICommandFactory deploy(IEnvironment environment, IContext ctx, ISelection selection, 
-            String projectName, String earProject) {
-        return null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public ICommandFactory develop(IEnvironment environment, IContext ctx, ISelection selection,
-            String projectName, String earProject) {
-        Vector commands = new Vector();
-
-        EclipseEnvironment eclipseEnvironment = (EclipseEnvironment) environment;
-        registerDataMappings(eclipseEnvironment.getCommandManager().getMappingRegistry());
-
-        if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-            Java2WSDataModel java2WSDataModel = CXFFactory.eINSTANCE.createJava2WSDataModel();
-            java2WSDataModel.setProjectName(projectName);
-            java2WSDataModel.setJavaStartingPoint(this.getWebServiceInfo().getImplURL());
-            commands.add(new Java2WSValidateInputCommand(java2WSDataModel));
-            commands.add(new Java2WSDefaultingCommand(java2WSDataModel));
-            commands.add(new Java2WSSelectSEICommand(java2WSDataModel));
-            commands.add(new JAXWSAnnotateJavaCommand(java2WSDataModel));
-            commands.add(new Java2WSCommand(java2WSDataModel));
-        } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-            WSDL2JavaDataModel wsdl2JavaDataModel = CXFFactory.eINSTANCE.createWSDL2JavaDataModel();
-            wsdl2JavaDataModel.setProjectName(projectName);
-            commands.add(new WSDL2JavaProjectSelectionCommand(wsdl2JavaDataModel));
-            commands.add(new WSDL2JavaDefaultingCommand(wsdl2JavaDataModel, projectName, 
-            		getWebServiceInfo().getWsdlURL()));
-            commands.add(new WSDL2JavaCommand(wsdl2JavaDataModel, this));
-        } else {
-            return null;
-        }
-
-        return new SimpleCommandFactory(commands);
-    }
-    
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-        dataRegistry.addMapping(Java2WSCommand.class, "CXFDataModel", CXFDeployCommand.class); //$NON-NLS-1$
-        dataRegistry.addMapping(WSDL2JavaCommand.class, "CXFDataModel", CXFDeployCommand.class); //$NON-NLS-1$
-        dataRegistry.addMapping(CXFDeployCommand.class, "ClientComponentType",  //$NON-NLS-1$
-                ClientExtensionDefaultingCommand.class);
-    }
-
-    @Override
-    public ICommandFactory install(IEnvironment environment, IContext ctx, ISelection selection, 
-            String projectName, String earProject) {
-        return null;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public ICommandFactory run(IEnvironment environment, IContext ctx, ISelection selection, 
-            String projectName, String earProject) {
-        Vector commands = new Vector();
-        commands.add(new CXFDeployCommand(projectName, this));
-        return new SimpleCommandFactory(commands);
-    }
-
-    @Override
-    public WebServiceInfo getWebServiceInfo() {
-        return super.getWebServiceInfo();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java
deleted file mode 100644
index 1b27240..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.creation.ui/src/org/eclipse/jst/ws/internal/cxf/creation/ui/wsrt/CXFWebServiceRuntime.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.cxf.consumption.ui.wsrt.CXFWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-/**
- * @author sclarke
- */
-@SuppressWarnings("restriction")
-public class CXFWebServiceRuntime extends AbstractWebServiceRuntime {
-
-    @Override
-    public IWebService getWebService(WebServiceInfo info) {
-        return new CXFWebService(info);
-    }
-
-    @Override
-    public IWebServiceClient getWebServiceClient(WebServiceClientInfo info) {
-        return new CXFWebServiceClient(info);
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/.classpath b/bundles/org.eclipse.jst.ws.cxf.ui/.classpath
deleted file mode 100644
index e721d0c..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.ui/.project b/bundles/org.eclipse.jst.ws.cxf.ui/.project
deleted file mode 100644
index 160341a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.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.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cadd13..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Nov 07 23:58:55 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.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index d3d798d..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.cxf.ui;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.cxf.ui;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.dialogs;x-internal:=true,
- org.eclipse.jst.ws.internal.cxf.ui.viewers;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,org.eclipse.jst.ws.cxf.creation.ui",
- org.eclipse.jst.ws.internal.cxf.ui.widgets;x-friends:="org.eclipse.jst.ws.cxf.consumption.ui,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.cxf.core;bundle-version="0.4.3",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0"
-Ant-Version: Apache Ant 1.7.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Created-By: 1.5.0_14-b03 (Sun Microsystems Inc.)
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/about.html b/bundles/org.eclipse.jst.ws.cxf.ui/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.ui/build.properties b/bundles/org.eclipse.jst.ws.cxf.ui/build.properties
deleted file mode 100644
index 534b8eb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.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.ui/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
deleted file mode 100644
index 991b896..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.properties
+++ /dev/null
@@ -1,15 +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 UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-PREFERENCE_CATEGORY_CXF_RUNTIME=CXF 2.x Preferences
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml b/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
deleted file mode 100644
index 23db738..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.cxf.ui.preferences.CXFRuntimePreferencePage"
-            id="org.eclipse.jst.ws.cxf.ui.CXFRuntimePreferencesPage"
-            name="%PREFERENCE_CATEGORY_CXF_RUNTIME">
-      </page>
-   </extension>
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
deleted file mode 100644
index 481d638..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIMessages.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author sclarke
- */
-public class CXFUIMessages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.cxf.ui.CXFUImessages"; //$NON-NLS-1$
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL;
-    public static String CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER;
-    
-    public static String JAVA2WS_PREFERENCES_TAB_NAME;
-    public static String JAVA2WS_PREFERENCES_TAB_TOOLTIP;
-
-    public static String JAVA2WSDL_PREFERENCES_TAB_NAME;
-    public static String JAVA2WSDL_PREFERENCES_TAB_TOOLTIP;
-
-    public static String ANNOTATIONS_PREFERENCES_TAB_NAME;
-    public static String ANNOTATIONS_PREFERENCES_TAB_TOOLTIP;
-
-    public static String WSDL2JAVA_PREFERENCES_TAB_NAME;
-    public static String WSDL2JAVA_PREFERENCES_TAB_TOOLTIP;
-    
-    public static String SPRING_CONFIG_PREFERENCES_TAB_NAME;
-    public static String SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP;
-    
-    public static String ANNOTATIONS_PREFERENCES_LINK;
-    
-    public static String CXF_DEFAULT_FRONTEND_LABEL;
-    public static String CXF_DEFAULT_DATABINDING_LABEL;
-    public static String JAVA2WS_GROUP_LABEL;
-    public static String JAVA2WSDL_GROUP_LABEL;
-    public static String WSDL2JAVA_GROUP_LABEL;
-    public static String JAVA2WS_GEN_CLIENT_LABEL;
-    public static String JAVA2WS_GEN_SERVER_LABEL;
-    public static String JAVA2WS_GEN_IMPLEMENTATION_LABEL;
-    public static String JAVA2WS_GEN_WRAPPER_FAULT_LABEL;
-    public static String JAVA2WS_GEN_WSDL_LABEL;
-    public static String JAVA2WS_DEFAULT_SOAPBINDING_LABEL;
-    public static String JAVA2WS_GEN_XSD_IMPORTS;
-    public static String CXF_INVALID_VERSION_FORMAT;
-    public static String CXF_VERSION_NOT_SPECIFIED;
-    public static String SPRING_CONFIG_GROUP_LABEL;
-    public static String SPRING_CONFIG_USE_CXF_SERVLET;
-    public static String SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT;
-    public static String WSDL2JAVA_PROCESS_SOAP_HEADERS;
-    public static String WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING;
-    public static String WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING;
-    public static String WSDL2JAVA_WSDL_VERSION_LABEL;
-    public static String WSDL2JAVA_USE_DEFAULT_VALUES;
-
-    public static String JAXWS_ANNOTATIONS_GROUP_LABEL;
-    public static String JAXWS_ANNOTATIONS_GROUP_TOOLTIP;
-    public static String JAXWS_GENERATE_WEB_METHOD;
-    public static String JAXWS_GENERATE_WEB_PARAM;
-    public static String JAXWS_GENERATE_REQUEST_WRAPPER;
-    public static String JAXWS_GENERATE_RESPONSE_WRAPPER;
-    public static String JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL;
-    public static String JAXWS_ENABLE_ANNOTATION_PROCESSING;
-    public static String JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP;
-    
-    public static String JAVA2WS_SOAP12_BINDING_TOOLTIP;
-    public static String JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP;
-    public static String JAVA2WS_DATABINDING_TOOLTIP;
-    public static String JAVA2WS_FRONTEND_TOOLTIP;
-    public static String JAVA2WS_GENERATE_WSDL_TOOLTIP;
-    public static String JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP;
-    public static String JAVA2WS_GENERATE_CLIENT_TOOLTIP;
-    public static String JAVA2WS_GENERATE_SERVER_TOOLTIP;
-    public static String JAVA2WS_GENERATE_ANT_TOOLTIP;
-    public static String JAVA2WS_BEANS_TOOLTIP;
-    public static String JAVA2WS_TARGET_NAMESPACE_TOOLTIP;
-    public static String JAVA2WS_SERVICE_NAME_TOOLTIP;
-    public static String JAVA2WS_PORT_NAME_TOOLTIP;
-    public static String JAVA2WS_ADDRESS_TOOLTIP;
-
-    public static String JAVA2WS_WSDL_FILE_NAME;
-    public static String JAVA2WS_OUTPUT_FILE_TOOLTIP;
-
-    public static String JAVA2WS_USE_SEI_BUTTON;
-    public static String JAVA2WS_USE_SEI_INFO_LABEL;
-
-    public static String JAVA2WS_SELECT_SEI;
-    public static String JAVA2WS_SELECT_SEI_LABEL;
-    public static String JAVA2WS_SELECT_SEI_TOOLTIP;
-    public static String JAVA2WS_EXTRACT_SEI;
-    public static String JAVA2WS_EXTRACT_SEI_LABEL;
-    public static String JAVA2WS_EXTRACT_SEI_TOOLTIP;
-    public static String JAVA2WS_EXTRACT_MEMBERS_LABEL;
-
-    public static String JAVA2WS_SELECT_ALL_BUTTON;
-    public static String JAVA2WS_DESELECT_ALL_BUTTON;
-
-    public static String JAVA2WS_SELECT_IMPLEMENTATION;
-    public static String JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP;
-
-    public static String WSDL2JAVA_FRONTEND_TOOLTIP;
-    public static String WSDL2JAVA_DATABINDING_TOOLTIP;
-    public static String WSDL2JAVA_WSDL_VERSION_TOOLTIP;
-    public static String WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP;
-    public static String WSDL2JAVA_GENERATE_CLIENT_TOOLTIP;
-    public static String WSDL2JAVA_GENERATE_SERVER_TOOLTIP;
-    public static String WSDL2JAVA_DEFAULT_VALUES_TOOLTIP;
-    public static String WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP;
-    public static String WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP;
-    public static String WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP;
-    public static String WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP;
-    public static String WSDL2JAVA_WSDL_LOCATION_TOOLTIP;
-    public static String WSDL2JAVA_NO_ADDRESS_BINDING;
-    public static String WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP;
-    public static String WSDL2JAVA_AUTO_NAME_RESOLUTION;
-    public static String WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP;
-    public static String WSDL2JAVA_XML_CATALOG_TOOLTIP;
-    public static String WSDL2JAVA_XJC_ARGS_TOOLTIP;
-    public static String WSDL2JAVA_XJC_ARG_GROUP_TITLE;
-    public static String WSDL2JAVA_XJC_ARG_COLUMN_NAME;
-    public static String WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME;
-    public static String WSDL2JAVA_XJC_DEFAULT_VALUES;
-    public static String WSDL2JAVA_XJC_TOSTRING;
-    public static String WSDL2JAVA_XJC_TOSTRING_MULTILINE;
-    public static String WSDL2JAVA_XJC_TOSTRING_SIMPLE;
-    public static String WSDL2JAVA_XJC_LOCATOR;
-    public static String WSDL2JAVA_XJC_SYNC_METHODS;
-    public static String WSDL2JAVA_XJC_MARK_GENERATED;
-    public static String WSDL2JAVA_XJC_EPISODE_FILE;
-
-    public static String RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON;
-    public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON;
-    public static String RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR;
-
-    public static String WSDL2JAVA_OUTPUT_DIRECTORY;
-    public static String WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP;
-
-    public static String WSDL2JAVA_PACKAGE_NAME;
-    public static String WSDL2JAVA_PACKAGE_NAME_TOOLTIP;
-
-    public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL;
-    public static String WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP;
-
-    public static String WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER;
-    public static String WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER;
-
-    public static String WSDL2JAVA_SERVICE_NAME;
-    public static String WSDL2JAVA_SERVICE_NAME_TOOLTIP;
-
-    public static String WSDL2JAVA_BINDING_FILES;
-    public static String WSDL2JAVA_BINDING_NAME_TOOLTIP;
-    public static String WSDL2JAVA_BINDING_FILES_ADD;
-    public static String WSDL2JAVA_BINDING_FILES_REMOVE;
-
-    public static String WSDL2JAVA_BINDING_FILE_DIALOG_TITLE;
-    public static String WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE;
-    public static String WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME;
-
-    public static String WSDL2JAVA_XML_CATLOG;
-    public static String WSDL2JAVA_XML_CATLOG_TOOLTIP;
-    public static String WSDL2JAVA_XML_CATLOG_BROWSE;
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, CXFUIMessages.class);
-    }
-
-    private CXFUIMessages() {
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
deleted file mode 100644
index 16d38ad..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUIPlugin.java
+++ /dev/null
@@ -1,78 +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.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
- * 
- * @author sclarke
- */
-public class CXFUIPlugin extends AbstractUIPlugin {
-
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.cxf.ui"; //$NON-NLS-1$
-
-    // The shared instance
-    private static CXFUIPlugin plugin;
-
-    /**
-     * The constructor
-     */
-    public CXFUIPlugin() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-        plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFUIPlugin getDefault() {
-        return plugin;
-    }
-
-    public static void logMessage(int severity, String message) {
-        CXFUIPlugin.log(new Status(severity, CXFUIPlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        CXFUIPlugin.getDefault().getLog().log(status);
-    }
-    
-    public static void log(Throwable exception) {
-        CXFUIPlugin.log(new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, 
-            exception.toString(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
deleted file mode 100644
index f41de49..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/CXFUImessages.properties
+++ /dev/null
@@ -1,166 +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
-###############################################################################
-
-#CXF Preference Pages
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME=&CXF Runtime
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP=Browse and select CXF Binary distribution folder
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL=CXF &Home:
-CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET=Missing CXF jar: Please select the CXF home directory.
-CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL=&Browse...
-CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL=Version:
-CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER=Export runtime libraries to WEB-INF/lib at deployment time
-
-JAVA2WSDL_PREFERENCES_TAB_NAME=Java2WSDL
-JAVA2WSDL_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WSDL tool
-
-JAVA2WS_PREFERENCES_TAB_NAME=&Java2WS
-JAVA2WS_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the Java2WS tool
-
-ANNOTATIONS_PREFERENCES_LINK=See the <A>'JAX-WS'</A> tab for the annotation preferences.
-
-ANNOTATIONS_PREFERENCES_TAB_NAME=JA&X-WS
-ANNOTATIONS_PREFERENCES_TAB_TOOLTIP=Please select the JAX-WS annotations that are generated by default on the class or interface before input to Java2WS
-
-WSDL2JAVA_PREFERENCES_TAB_NAME=&WSDL2Java
-WSDL2JAVA_PREFERENCES_TAB_TOOLTIP=Please select the default preferences for the WSDL2Java tool
-
-SPRING_CONFIG_PREFERENCES_TAB_NAME=&Spring Config
-SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP=Please select the default option for Spring configuration generation
-SPRING_CONFIG_USE_CXF_SERVLET=Use CX&F Servlet
-SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT=Use Spring &Application Context
-
-CXF_DEFAULT_FRONTEND_LABEL=Default &Frontend:
-CXF_DEFAULT_DATABINDING_LABEL=Default &Databindng:
-JAVA2WS_GROUP_LABEL=Java2WS Generation Options:
-JAVA2WSDL_GROUP_LABEL=Java2WSDL Generation Options:
-WSDL2JAVA_GROUP_LABEL=WSDL2Java Generation Options:
-JAVA2WS_GEN_CLIENT_LABEL=Generate Cli&ent
-JAVA2WS_GEN_SERVER_LABEL=Generate Ser&ver
-JAVA2WS_GEN_IMPLEMENTATION_LABEL=Generate &Implementation
-JAVA2WS_GEN_WRAPPER_FAULT_LABEL=Generate Wrapper and Fault &Beans
-JAVA2WS_GEN_WSDL_LABEL=Generate WSD&L
-JAVA2WS_DEFAULT_SOAPBINDING_LABEL=Default S&OAP Binding:
-JAVA2WS_GEN_XSD_IMPORTS=Generate separate XSD for the &types
-CXF_INVALID_VERSION_FORMAT=Invalid Version Format
-CXF_VERSION_NOT_SPECIFIED=CXF version value not specified
-SPRING_CONFIG_GROUP_LABEL=CXF Endpoint Configuration Options:
-WSDL2JAVA_PROCESS_SOAP_HEADERS=Enable &processing of implicit SOAP headers
-WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING=Enable &loading of the default namespace package name mapping
-WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING=Enable the use of the default &excludes namespace mapping
-WSDL2JAVA_WSDL_VERSION_LABEL=WSDL Version:
-WSDL2JAVA_USE_DEFAULT_VALUES=Generate &default values for the generated artifacts
-
-JAXWS_ANNOTATIONS_GROUP_LABEL=JAX-WS Annotation Generation
-JAXWS_ANNOTATIONS_GROUP_TOOLTIP=Select the annotations which are generated by default on the class or interface before input to Java2WS
-JAXWS_GENERATE_WEB_METHOD=@Web&Method
-JAXWS_GENERATE_WEB_PARAM=@Web&Param
-JAXWS_GENERATE_REQUEST_WRAPPER=@Re&questWrapper
-JAXWS_GENERATE_RESPONSE_WRAPPER=@&ResponseWrapper
-JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL=JAX-WS Annotation Processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING=&Enable annotation validation processing
-JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP=Turn JAX-WS annotation processing on or off in projects configured for {0} web services
-    
-JAVA2WS_SOAP12_BINDING_TOOLTIP=Specify to generate SOAP 1.2 binding
-JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP= Output schemas to separate files and use imports to load them instead of inlining them into the wsdl
-JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding. Default is jaxb for jaxws frontend
-#JAVA2WS_DATABINDING_TOOLTIP= Specify the data binding (aegis or jaxb). Default is jaxb for jaxws frontend, and aegis for simple frontend
-JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use
-#JAVA2WS_FRONTEND_TOOLTIP=Specify the frontend to use. jaxws and the simple frontend are supported
-JAVA2WS_GENERATE_WSDL_TOOLTIP=Specify to generate the WSDL file
-JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP=Specify to generate the wrapper and fault bean
-JAVA2WS_GENERATE_CLIENT_TOOLTIP=Generate a client mainline using JAX-WS APIs\n.....\n javax.xml.ws.Service service = javax.xml.ws.Service.create(...);\n... client = service.getPort(...);\n
-JAVA2WS_GENERATE_SERVER_TOOLTIP=Generate a server mainline using JAX-WS APIs\n.....\n javax.xml.ws.Endpoint.publish(...);\n.....\n
-JAVA2WS_GENERATE_ANT_TOOLTIP=Specify to generate an Ant build.xml file
-JAVA2WS_BEANS_TOOLTIP=Specify the pathname of a file defining additional Spring beans to customise data binding configuration
-JAVA2WS_TARGET_NAMESPACE_TOOLTIP=Specify the target namespace to use in the wsdl
-JAVA2WS_SERVICE_NAME_TOOLTIP=Specify the service name to use in the generated wsdl
-JAVA2WS_PORT_NAME_TOOLTIP=Specify the port name to use in the generated wsdl
-JAVA2WS_ADDRESS_TOOLTIP= Specify the port address
-
-JAVA2WS_WSDL_FILE_NAME=&WSDL File:
-JAVA2WS_OUTPUT_FILE_TOOLTIP=Specify the output wsdl file name
-
-JAVA2WS_USE_SEI_BUTTON=&Use a Service Endpoint Interface:
-JAVA2WS_USE_SEI_INFO_LABEL=(You may work directly with the {0} Java class. But working from an interface is the recommended approach. Two options are provided here.)
-JAVA2WS_SELECT_SEI=Select SEI:
-JAVA2WS_SELECT_SEI_LABEL=Select SEI from &Type Hierarchy:
-JAVA2WS_SELECT_SEI_TOOLTIP=Select the Interface from the Type Hierarchy to use as the SEI
-JAVA2WS_EXTRACT_SEI=Extract SEI:
-JAVA2WS_EXTRACT_SEI_LABEL=&Extract an SEI:
-JAVA2WS_EXTRACT_SEI_TOOLTIP=Type the name of the Service Endpoint Interface to extract
-JAVA2WS_EXTRACT_MEMBERS_LABEL=Members to declare in the extracted SEI:
-JAVA2WS_SELECT_ALL_BUTTON=&Select All...
-JAVA2WS_DESELECT_ALL_BUTTON=&Deselect All...
-JAVA2WS_SELECT_IMPLEMENTATION=Select &Implementation:
-JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP=Select the Implementation
-
-WSDL2JAVA_FRONTEND_TOOLTIP=Specify the frontend. Default is JAXWS. Currently supports only JAXWS frontend
-WSDL2JAVA_DATABINDING_TOOLTIP=Specify the databinding. Default is JAXB. Currently supports only JAXB databinding
-WSDL2JAVA_WSDL_VERSION_TOOLTIP=Specify the wsdl version .Default is WSDL1.1. Currently suppports only WSDL1.1 version
-WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP=Generate starting point code for an implementation object
-WSDL2JAVA_GENERATE_CLIENT_TOOLTIP=Generate the client code
-WSDL2JAVA_GENERATE_SERVER_TOOLTIP=Generate the server code
-WSDL2JAVA_DEFAULT_VALUES_TOOLTIP=Generate default values in the implementation and client. Ignored if implementation or client is not being generated
-WSDL2JAVA_EXCLUDE_NAMESPACE_TOOLTIP=Ignore the specified WSDL schema namespaces when generating code
-WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP=Enables or disables processing of extended soap header message binding
-WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default namespace package name mapping
-WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP=Enables or disables loading of the default excludes namespace mapping
-WSDL2JAVA_WSDL_LOCATION_TOOLTIP=Specifies the value of the @WebService annotation's wsdlLocation property
-WSDL2JAVA_XML_CATALOG_TOOLTIP=Specify the URL of an XML catalog to use for resolving imported schemas and WSDL documents
-WSDL2JAVA_NO_ADDRESS_BINDING=Use the {0} proprietary WS-&Addressing type
-WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP=Use the {0} proprietary WS-Addressing type instead of the JAX-WS 2.1 compliant mapping
-WSDL2JAVA_AUTO_NAME_RESOLUTION=Enable Auto Name Resolution
-WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP=Automatically resolve naming conflicts without requiring the use of binding customizations
-WSDL2JAVA_XJC_ARGS_TOOLTIP=Specify the arguments to be passed to directly to the XJC
-WSDL2JAVA_XJC_ARG_GROUP_TITLE=XJC Arguments
-WSDL2JAVA_XJC_ARG_COLUMN_NAME=XJC Arg
-WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME=Description
-WSDL2JAVA_XJC_DEFAULT_VALUES=Initialise fields mapped from elements with their default values
-WSDL2JAVA_XJC_TOSTRING=Activate plugin to add a toString() method to generated classes
-WSDL2JAVA_XJC_TOSTRING_MULTILINE=Have toString produce multi line output
-WSDL2JAVA_XJC_TOSTRING_SIMPLE=Have toString produce single line terse output
-WSDL2JAVA_XJC_LOCATOR=Enable source location support for generated code
-WSDL2JAVA_XJC_SYNC_METHODS=Generate accessor methods with the 'synchronized' keyword
-WSDL2JAVA_XJC_MARK_GENERATED=Add @Generated annotations to the generated code
-#Mark the generated code as @javax.annotation.Generated
-WSDL2JAVA_XJC_EPISODE_FILE= Generate the episode file for separate compilation
-#Resource Selection Dialog
-RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON=Browse Workspace...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON=Browse File System...
-RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR=File Not Found
-
-WSDL2JAVA_OUTPUT_DIRECTORY=&Output Directory:
-WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP=Specify the directory into which the generated code files are written
-
-WSDL2JAVA_PACKAGE_NAME=&Package Name:
-WSDL2JAVA_PACKAGE_NAME_TOOLTIP=The java package name to use for the generated code
-
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL=Specify &WSDL Namepsace to Package Name Mappings
-WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP=Optionally specify the wsdl namespace mapping to a particular java package name
-
-WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER=WSDL Namespace
-WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER=Package Name
-
-WSDL2JAVA_SERVICE_NAME=&Service Name:
-WSDL2JAVA_SERVICE_NAME_TOOLTIP=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
-
-WSDL2JAVA_BINDING_FILES=&Binding Files:
-WSDL2JAVA_BINDING_NAME_TOOLTIP=Specify zero, or more, JAXWS or JAXB binding files
-WSDL2JAVA_BINDING_FILES_ADD=&Add...
-WSDL2JAVA_BINDING_FILES_REMOVE=&Remove...
-
-WSDL2JAVA_BINDING_FILE_DIALOG_TITLE=Browse for Binding File
-WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE=Binding File:
-WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME=JAXWS or JAXB Binding Files (*.xml)
-
-WSDL2JAVA_XML_CATLOG=XML Catalog:
-WSDL2JAVA_XML_CATLOG_TOOLTIP=Specify catalog file to map the imported wsdl/schema
-WSDL2JAVA_XML_CATLOG_BROWSE=Browse...
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
deleted file mode 100644
index edbe000..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/dialogs/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,242 +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.ui.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * A <code>SelectionStatusDialog</code> which allows the selection of files
- * with a specific extension from the workspace or file system.
- * 
- * @author sclarke
- */
-public class ResourceSelectionDialog extends SelectionStatusDialog {
-    private IStatus OK_FILE_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
-    private IStatus ERROR_FILE_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
-            CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_NOT_FOUND_ERROR);
-
-    private IStatus VALIDATE_SELECTION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-
-    private Text resourceText;
-
-    private String filterExtension;
-    private String filterName;
-
-    /**
-     * Creates an instance of <code>ResourceSelectionDialog</code>
-     * 
-     * @param parent
-     * @param filterExtension
-     *            the file name extension which the dialogs will use to filter
-     *            files
-     * @param filterName
-     *            the name that describes the filterExtension
-     * @param dialogTitle
-     *            the dialog title
-     */
-    public ResourceSelectionDialog(Shell parent, String filterExtension, String filterName, String dialogTitle) {
-        super(parent);
-
-        this.filterExtension = filterExtension;
-        this.filterName = filterName;
-
-        setTitle(dialogTitle);
-        setStatusLineAboveButtons(true);
-        int shellStyle = getShellStyle();
-        setShellStyle(shellStyle | SWT.MAX | SWT.RESIZE);
-        updateStatus(VALIDATE_SELECTION_STATUS);
-    }
-
-    @Override
-    protected Control createDialogArea(Composite parent) {
-        final Composite composite = (Composite) super.createDialogArea(parent);
-
-        Composite buttonComposite = new Composite(composite, SWT.NONE);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.widthHint = 500;
-        buttonComposite.setLayoutData(gridData);
-
-        GridLayout gridLayout = new GridLayout(3, false);
-        buttonComposite.setLayout(gridLayout);
-
-        Label messageLabel = createMessageArea(buttonComposite);
-        gridData = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
-        messageLabel.setLayoutData(gridData);
-
-        Button browseWorkspace = new Button(buttonComposite, SWT.PUSH);
-        browseWorkspace.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_WORKSPACE_BUTTON);
-        browseWorkspace.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                SelectionDialog dialog = createWorkspaceResourceDialog(composite.getShell());
-                if (dialog.open() == SelectionDialog.OK) {
-                    Object[] result = dialog.getResult();
-                    IResource resource = (IResource) result[0];
-                    resourceText.setText(resource.getLocation().toOSString());
-                }
-            }
-        });
-
-        gridData = new GridData(SWT.END, SWT.FILL, false, false);
-        browseWorkspace.setLayoutData(gridData);
-
-        Button browseFileSystem = new Button(buttonComposite, SWT.PUSH);
-        browseFileSystem.setText(CXFUIMessages.RESOURCE_SELECTIN_DIALOG_BROWSE_FILE_SYSTEM_BUTTON);
-        browseFileSystem.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                FileDialog dialog = createFileSystemResourceDialog(composite.getShell());
-                String result = dialog.open();
-                if (result == null) {
-                    return;
-                }
-                IPath filterPath = new Path(dialog.getFilterPath());
-                String buildFileName = dialog.getFileName();
-                IPath path = filterPath.append(buildFileName).makeAbsolute();
-
-                resourceText.setText(path.toOSString());
-            }
-        });
-        gridData = new GridData(SWT.END, SWT.FILL, false, false);
-        browseFileSystem.setLayoutData(gridData);
-
-        resourceText = new Text(buttonComposite, SWT.BORDER);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        resourceText.addModifyListener(new ModifyListener() {
-
-            public void modifyText(ModifyEvent event) {
-                String resource = resourceText.getText();
-                File file = new File(resource);
-                if (file.exists()) {
-                    setResult(Arrays.asList(resource));
-                    updateStatus(OK_FILE_STATUS);
-                } else {
-                    updateStatus(ERROR_FILE_STATUS);
-                }
-            }
-        });
-        gridData.horizontalSpan = 3;
-        resourceText.setLayoutData(gridData);
-
-        return composite;
-    }
-
-    private SelectionDialog createWorkspaceResourceDialog(Shell shell) {
-        ElementTreeSelectionDialog workspaceResourceDialog = new ElementTreeSelectionDialog(shell,
-                new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-
-        workspaceResourceDialog.setTitle(getMessage());
-        workspaceResourceDialog.setMessage(filterName);
-        workspaceResourceDialog.setAllowMultiple(false);
-
-        workspaceResourceDialog.addFilter(new ViewerFilter() {
-            @Override
-            public boolean select(Viewer viewer, Object parentElement, Object element) {
-                if (element instanceof IFile) {
-                    IFile file = (IFile) element;
-                    return file.isAccessible() && file.getFileExtension().equals(filterExtension);
-                }
-
-                if (element instanceof IProject && !((IProject) element).isOpen()) {
-                    IProject project = (IProject) element;
-                    return project.isAccessible();
-                }
-
-                if (element instanceof IContainer) {
-                    try {
-                        IContainer container = (IContainer) element;
-                        IResource[] resources = container.members();
-                        for (IResource resource : resources) {
-                            if (select(viewer, parentElement, resource)) {
-                                return true;
-                            }
-                        }
-                    } catch (CoreException ce) {
-                        CXFUIPlugin.log(ce.getStatus());
-                    }
-                }
-                return false;
-            }
-        });
-
-        workspaceResourceDialog.setValidator(new ISelectionStatusValidator() {
-
-            public IStatus validate(Object[] selection) {
-                if (selection.length > 0) {
-                    Object selected = selection[0];
-                    if (selected instanceof IFile) {
-                        IFile file = (IFile) selected;
-                        if (file.getFileExtension().equals(filterExtension)) {
-                            return OK_FILE_STATUS;
-                        }
-                    }
-                }
-                return VALIDATE_SELECTION_STATUS;
-            }
-        });
-
-        workspaceResourceDialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
-        return workspaceResourceDialog;
-    }
-
-    private FileDialog createFileSystemResourceDialog(Shell shell) {
-        FileDialog dialog = new FileDialog(shell, SWT.OPEN);
-        dialog.setFilterExtensions(new String[] { "*" + filterExtension }); //$NON-NLS-1$;
-        dialog.setFilterNames(new String[] { filterName });
-        return dialog;
-    }
-
-    @Override
-    protected void computeResult() {
-        // do nothing
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
deleted file mode 100644
index bb6dce4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/preferences/CXFRuntimePreferencePage.java
+++ /dev/null
@@ -1,520 +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.ui.preferences;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.AnnotationsComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.BlankRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF20WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.CXF21WSDL2JavaPreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSDLRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.Java2WSRuntimePreferencesComposite;
-import org.eclipse.jst.ws.internal.cxf.ui.widgets.SpringConfigComposite;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.osgi.framework.Version;
-
-/**
- * @author sclarke
- */
-public class CXFRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-    private IStatus CXF_LOCATION_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, null);
-    private IStatus OK_STATUS = new Status(IStatus.OK, CXFUIPlugin.PLUGIN_ID, ""); //$NON-NLS-1$
-    
-    private Pattern digitPattern = Pattern.compile("\\d"); //$NON-NLS-1$
-    
-    private Button browseButton;
-    private Text cxfHomeDirText;
-
-    private Label cxfToolVersionLabel;
-    
-    private Button exportCXFClasspathContainerButton;
-
-    private CXFContext context;
-
-    private Java2WSDLRuntimePreferencesComposite java2WSDLRuntimePreferencesComposite;
-    private Java2WSRuntimePreferencesComposite java2WSRuntimePreferencesComposite ;
-    
-    private CXF20WSDL2JavaPreferencesComposite cxf20WSDL2JavaPreferencesComposite;
-    private CXF21WSDL2JavaPreferencesComposite cxf21WSDL2JavaPreferencesComposite;
-    
-    private AnnotationsComposite annotationsComposite;
-    
-    private SpringConfigComposite springConfigComposite;
-    
-    private StackLayout java2WSStackLayout;
-    private StackLayout wsdl2javaStackLayout;
-    private StackLayout jaxwsStackLayout;
-    private StackLayout springConfigStackLayout;
-    
-    private Composite java2WSPreferncesGroup;
-    private Composite wsdl2JavaPreferencesGroup;
-    private Composite jaxwsPreferencesGroup;
-    private Composite springConfigPreferncesGroup;
-    
-    private Composite java2WSDLPreferencesComposite;
-    private Composite java2WSPreferencesComposite;
-    
-    private Composite jaxwsPreferencesComposite;
-    
-    private Composite wsdl2Java20PreferencesComposite;
-    private Composite wsdl2Java21PreferencesComposite;
-
-    private Composite springPreferencesComposite;
-    
-    private BlankRuntimePreferencesComposite java2WSBlankPreferencesComposite;
-    private BlankRuntimePreferencesComposite wsdl2JavaBlankPreferencesComposite;
-    private BlankRuntimePreferencesComposite jaxwsBlankPreferencesComposite;
-    private BlankRuntimePreferencesComposite springConfigBlankPreferencesComposite;
-
-    public CXFRuntimePreferencePage() {
-    }
-
-    public void init(IWorkbench workbench) {
-    }
-
-    @Override
-    protected Control createContents(Composite parent) {
-        context = CXFCorePlugin.getDefault().getJava2WSContext();
-
-        final Composite composite = new Composite(parent, SWT.NONE);
-
-        GridLayout mainLayout = new GridLayout();
-        composite.setLayout(mainLayout);
-        GridData gridData = new GridData(GridData.FILL_BOTH);
-        composite.setLayoutData(gridData);
-
-        TabFolder cxfPreferenceTab = new TabFolder(composite, SWT.NONE);
-        gridData = new GridData(GridData.FILL_BOTH);
-        cxfPreferenceTab.setLayoutData(gridData);
-
-        //CXF Runtime Location
-        TabItem runtimeInstalLocationItem = new TabItem(cxfPreferenceTab, SWT.NONE);
-        runtimeInstalLocationItem.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_NAME);
-        runtimeInstalLocationItem
-                .setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
-        final Composite runtimeGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
-        runtimeInstalLocationItem.setControl(runtimeGroup);
-        runtimeGroup.setToolTipText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_HOME_TAB_TOOLTIP);
-
-        GridLayout runtimeLoactionlayout = new GridLayout();
-
-        runtimeLoactionlayout.numColumns = 3;
-        runtimeLoactionlayout.marginHeight = 10;
-        runtimeGroup.setLayout(runtimeLoactionlayout);
-        gridData = new GridData(GridData.FILL_BOTH);
-        runtimeGroup.setLayoutData(gridData);
-
-        Label label = new Label(runtimeGroup, SWT.NONE);
-        label.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_HOME_DIR_LABEL);
-
-        cxfHomeDirText = new Text(runtimeGroup, SWT.BORDER);
-        if (context.getCxfRuntimeLocation() != null) {
-            cxfHomeDirText.setText(context.getCxfRuntimeLocation());
-        }
-
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-
-        cxfHomeDirText.setLayoutData(gridData);
-        cxfHomeDirText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                context.setCxfRuntimeLocation(cxfHomeDirText.getText());
-                updateStatus();
-                handlePreferenceControls();
-            }
-        });
-
-        browseButton = new Button(runtimeGroup, SWT.NONE);
-        browseButton.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_BROWSE_BUTTON_LABEL);
-
-        browseButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                DirectoryDialog fileDialog = new DirectoryDialog(composite.getShell());
-                String fileName = fileDialog.open();
-                if (fileName != null) {
-                    cxfHomeDirText.setText(fileName);
-                    context.setCxfRuntimeLocation(cxfHomeDirText.getText());
-                }
-            }
-        });
-
-        // CXF Version
-        Label cxfVersionLabel = new Label(runtimeGroup, SWT.NONE);
-        cxfVersionLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_CXF_VERSON_LABEL);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        cxfVersionLabel.setLayoutData(gridData);
-
-        cxfToolVersionLabel = new Label(runtimeGroup, SWT.NONE);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.horizontalSpan = 2;
-        cxfToolVersionLabel.setLayoutData(gridData);
-        
-        Label paddingLabel = new Label(runtimeGroup, SWT.NONE);
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.horizontalSpan = 3;
-        paddingLabel.setLayoutData(gridData);
-        
-        exportCXFClasspathContainerButton = new Button(runtimeGroup, SWT.CHECK);
-        exportCXFClasspathContainerButton.setText(
-                CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_EXPORT_CXF_CLASSPATH_CONTAINER);
-        exportCXFClasspathContainerButton.setSelection(context.isExportCXFClasspathContainer());
-        exportCXFClasspathContainerButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setExportCXFClasspathContainer(((Button) e.widget).getSelection());
-            }
-        });
-        gridData = new GridData(SWT.FILL, SWT.FILL, false, false);
-        gridData.horizontalSpan = 3;
-        exportCXFClasspathContainerButton.setLayoutData(gridData);
-        
-        if (context.getCxfRuntimeVersion().length() > 0) {
-            cxfToolVersionLabel.setText(context.getCxfRuntimeEdition() + " " + context.getCxfRuntimeVersion()); //$NON-NLS-1$
-            exportCXFClasspathContainerButton.setEnabled(true);
-        } else {
-            exportCXFClasspathContainerButton.setEnabled(false);
-        }
-        
-        //Java2WS
-        TabItem java2WSTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
-        java2WSTabItem.setText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_NAME);
-        java2WSTabItem.setToolTipText(CXFUIMessages.JAVA2WS_PREFERENCES_TAB_TOOLTIP);
-
-        java2WSPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-
-        java2WSStackLayout = new StackLayout();
-        java2WSPreferncesGroup.setLayout(java2WSStackLayout);
-
-        java2WSDLPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
-        GridLayout java2WSGridLayout = new GridLayout(1, true);
-        java2WSDLPreferencesComposite.setLayout(java2WSGridLayout);
-
-        java2WSDLRuntimePreferencesComposite = new Java2WSDLRuntimePreferencesComposite(
-                java2WSDLPreferencesComposite, SWT.NONE, cxfPreferenceTab);
-        java2WSDLRuntimePreferencesComposite.addControls();
-
-        java2WSPreferencesComposite = new Composite(java2WSPreferncesGroup, SWT.NONE);
-        GridLayout java2WSDLGridLayout = new GridLayout(1, true);
-        java2WSPreferencesComposite.setLayout(java2WSDLGridLayout);
-
-        java2WSRuntimePreferencesComposite = new Java2WSRuntimePreferencesComposite(
-                java2WSPreferencesComposite, SWT.NONE, cxfPreferenceTab);
-        java2WSRuntimePreferencesComposite.addControls();
-
-        java2WSBlankPreferencesComposite = new BlankRuntimePreferencesComposite(java2WSPreferncesGroup,
-                SWT.NONE);
-
-        java2WSTabItem.setControl(java2WSPreferncesGroup);
-        
-        //WSDL2Java
-        TabItem wsdl2JavaTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
-        wsdl2JavaTabItem.setText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_NAME);
-        wsdl2JavaTabItem.setToolTipText(CXFUIMessages.WSDL2JAVA_PREFERENCES_TAB_TOOLTIP);
-
-        wsdl2JavaPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-        
-        wsdl2javaStackLayout = new StackLayout();
-        wsdl2JavaPreferencesGroup.setLayout(wsdl2javaStackLayout);
-
-        wsdl2Java20PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
-        GridLayout wsdl2Java20GridLayout = new GridLayout(1, true);
-        wsdl2Java20PreferencesComposite.setLayout(wsdl2Java20GridLayout);
-
-        cxf20WSDL2JavaPreferencesComposite = new CXF20WSDL2JavaPreferencesComposite(
-                wsdl2Java20PreferencesComposite, SWT.NONE);
-        cxf20WSDL2JavaPreferencesComposite.addControls();
-
-        wsdl2Java21PreferencesComposite = new Composite(wsdl2JavaPreferencesGroup, SWT.NONE);
-        GridLayout wsdl2Java21GridLayout = new GridLayout(1, true);
-        wsdl2Java21PreferencesComposite.setLayout(wsdl2Java21GridLayout);
-
-        cxf21WSDL2JavaPreferencesComposite = new CXF21WSDL2JavaPreferencesComposite(
-                wsdl2Java21PreferencesComposite, SWT.NONE);
-        cxf21WSDL2JavaPreferencesComposite.addControls();
-
-        wsdl2JavaBlankPreferencesComposite = new BlankRuntimePreferencesComposite(wsdl2JavaPreferencesGroup,
-                SWT.NONE);
-
-        wsdl2JavaTabItem.setControl(wsdl2JavaPreferencesGroup);
-        
-        //JAX-WS
-        TabItem annotationsTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
-        annotationsTabItem.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_NAME);
-        annotationsTabItem.setToolTipText(CXFUIMessages.ANNOTATIONS_PREFERENCES_TAB_TOOLTIP);
-        
-        jaxwsPreferencesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-        
-        jaxwsStackLayout = new StackLayout();
-        jaxwsPreferencesGroup.setLayout(jaxwsStackLayout);
-        
-        jaxwsPreferencesComposite = new Composite(jaxwsPreferencesGroup, SWT.NONE);
-        GridLayout jaxwsGridLayout = new GridLayout(1, true);
-        jaxwsPreferencesComposite.setLayout(jaxwsGridLayout);
-        annotationsComposite = new AnnotationsComposite(jaxwsPreferencesComposite,  SWT.SHADOW_IN);
-        
-        jaxwsBlankPreferencesComposite = new BlankRuntimePreferencesComposite(jaxwsPreferencesGroup,
-                SWT.NONE);
-        
-        annotationsTabItem.setControl(jaxwsPreferencesGroup);
-        
-        //Spring Config
-        TabItem springConfigTabItem = new TabItem(cxfPreferenceTab, SWT.NONE);
-        springConfigTabItem.setText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_NAME);
-        springConfigTabItem.setToolTipText(CXFUIMessages.SPRING_CONFIG_PREFERENCES_TAB_TOOLTIP);
-        
-        springConfigPreferncesGroup = new Composite(cxfPreferenceTab, SWT.NONE);
-        
-        springConfigStackLayout = new StackLayout();
-        springConfigPreferncesGroup.setLayout(springConfigStackLayout);
-        
-        springPreferencesComposite = new Composite(springConfigPreferncesGroup, SWT.NONE);
-        GridLayout springGridLayout = new GridLayout(1, true);
-        springPreferencesComposite.setLayout(springGridLayout);
-        springConfigComposite = new SpringConfigComposite(springPreferencesComposite, SWT.SHADOW_IN);
-        
-        springConfigBlankPreferencesComposite = new BlankRuntimePreferencesComposite(springConfigPreferncesGroup,
-                SWT.NONE);
-
-        springConfigTabItem.setControl(springConfigPreferncesGroup);
-
-        handlePreferenceControls();
-
-        return composite;
-    }
-
-    private void handlePreferenceControls() {
-        if (context.getCxfRuntimeLocation().equals("") || context.getCxfRuntimeVersion().equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-            java2WSStackLayout.topControl = java2WSBlankPreferencesComposite;
-            wsdl2javaStackLayout.topControl = wsdl2JavaBlankPreferencesComposite;
-            jaxwsStackLayout.topControl = jaxwsBlankPreferencesComposite;
-            springConfigStackLayout.topControl = springConfigBlankPreferencesComposite;
-        } else if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            java2WSStackLayout.topControl = java2WSPreferencesComposite;
-            wsdl2javaStackLayout.topControl = wsdl2Java21PreferencesComposite;
-            jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
-            springConfigStackLayout.topControl = springPreferencesComposite;
-        } else {
-            java2WSStackLayout.topControl = java2WSDLPreferencesComposite;
-            wsdl2javaStackLayout.topControl = wsdl2Java20PreferencesComposite;
-            jaxwsStackLayout.topControl = jaxwsPreferencesComposite;
-            springConfigStackLayout.topControl = springPreferencesComposite;
-        }
-        java2WSPreferncesGroup.layout();
-        wsdl2JavaPreferencesGroup.layout();
-        jaxwsPreferencesGroup.layout();
-        springConfigPreferncesGroup.layout();
-        refresh();
-    }
-
-    private IStatus checkRuntimeExist(String path) {
-        File cxfHomeDir = new File(path);
-        if (cxfHomeDirText.getText().equals("")) { //$NON-NLS-1$
-            CXF_LOCATION_STATUS = new Status(IStatus.ERROR, CXFUIPlugin.PLUGIN_ID,
-                    CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
-        }
-        String cxfLibPath = cxfHomeDir + System.getProperty("file.separator") + "lib"; //$NON-NLS-1$ //$NON-NLS-2$
-        if (cxfHomeDir.isDirectory()) {
-            File cxfLibFolder = new File(cxfLibPath);
-            if (cxfLibFolder.isDirectory()) {
-                String[] cxfJarFiles = getCXFJarFiles(cxfLibFolder);
-                if (cxfJarFiles != null && cxfJarFiles.length > 0) {
-                    IStatus toolVersionStatus = getToolVersion(cxfLibPath);
-                    processToolVersion(toolVersionStatus);
-                    CXF_LOCATION_STATUS = OK_STATUS;
-                    exportCXFClasspathContainerButton.setEnabled(true);
-                    return CXF_LOCATION_STATUS;
-                }
-            }
-        }
-        context.setCxfRuntimeLocation(""); //$NON-NLS-1$
-        context.setCxfRuntimeVersion(""); //$NON-NLS-1$
-        cxfToolVersionLabel.setText(""); //$NON-NLS-1$
-        exportCXFClasspathContainerButton.setEnabled(false);
-        CXF_LOCATION_STATUS = new Status(Status.ERROR, CXFUIPlugin.PLUGIN_ID,
-                CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
-        return CXF_LOCATION_STATUS;
-    }
-
-    private IStatus getToolVersion(String cxLibFolderPath) {
-        File cxfLibFolder = new File(cxLibFolderPath);
-        List<String> cxfLib = new ArrayList<String>();
-        String[] jarFiles = cxfLibFolder.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                if (name.endsWith(".jar")) { //$NON-NLS-1$
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        for (String jarFile : jarFiles) {
-            cxfLib.add(cxLibFolderPath + System.getProperty("file.separator") + jarFile); //$NON-NLS-1$
-        }
-
-        IStatus toolVersionStatus = LaunchUtils.launch(cxfLib.toArray(new String[cxfLib.size()]),
-                "org.apache.cxf.tools.wsdlto.WSDLToJava", new String[] { "-v" }); //$NON-NLS-1$ //$NON-NLS-2$
-        return toolVersionStatus;
-    }
-
-    private String[] getCXFJarFiles(File directory) {
-        String[] cxfJarFiles = directory.list(new FilenameFilter() {
-            public boolean accept(File dir, String name) {
-                if (name.startsWith("cxf") && name.endsWith(".jar") //$NON-NLS-1$ //$NON-NLS-2$
-                        && digitPattern.matcher(name).find()) {
-                    return true;
-                }
-                return false;
-            }
-        });
-        return cxfJarFiles;
-    }
-
-    private void processToolVersion(IStatus toolVersionStatus) {
-        if (toolVersionStatus.getSeverity() == IStatus.INFO) {
-            String cxfToolVersion = toolVersionStatus.getMessage();
-
-            cxfToolVersion = cxfToolVersion.substring(cxfToolVersion.indexOf("-") + 1, //$NON-NLS-1$
-                    cxfToolVersion.length()).trim();
-
-            String cxfRuntimeEdition = ""; //$NON-NLS-1$
-            String cxfRuntimeVersion = ""; //$NON-NLS-1$
-
-            Matcher matcher = digitPattern.matcher(cxfToolVersion);
-            if (matcher.find()) {
-                int start = matcher.start();
-                int end = matcher.end();
-                while (matcher.find()) {
-                    end = matcher.end();
-                }
-                cxfRuntimeEdition = cxfToolVersion.substring(0, start).trim();
-                cxfRuntimeVersion = cxfToolVersion.substring(start, end);
-            }
-            
-            cxfToolVersionLabel.setText(cxfRuntimeEdition + " " + cxfRuntimeVersion); //$NON-NLS-1$
-
-            context.setCxfRuntimeVersion(cxfRuntimeVersion);
-            context.setCxfRuntimeEdition(cxfRuntimeEdition);
-            
-            CXFCorePlugin.getDefault().setCurrentRuntimeVersion(new Version(cxfRuntimeVersion));
-        }
-    }
-
-    private void updateStatus() {
-        CXF_LOCATION_STATUS = checkRuntimeExist(cxfHomeDirText.getText());
-        applyStatusToPage(findMostSevere());
-    }
-
-    private void applyStatusToPage(IStatus status) {
-        String message = status.getMessage();
-        if (status.getSeverity() > IStatus.OK) {
-            setErrorMessage(message);
-        } else {
-            setMessage(getTitle());
-            setErrorMessage(null);
-        }
-
-    }
-
-    private IStatus findMostSevere() {
-        return CXF_LOCATION_STATUS;
-    }
-
-    private void setDefaults() {
-        exportCXFClasspathContainerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.CXF_CONTEXT, CXFPackage.CXF_CONTEXT__EXPORT_CXF_CLASSPATH_CONTAINER));
-        
-        java2WSDLRuntimePreferencesComposite.setDefaults();
-        java2WSRuntimePreferencesComposite.setDefaults();
-        cxf20WSDL2JavaPreferencesComposite.setDefaults();
-        cxf21WSDL2JavaPreferencesComposite.setDefaults();
-        annotationsComposite.setDefaults();
-        springConfigComposite.setDefaults();
-    }
-    
-    private void refresh() {
-        if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            java2WSRuntimePreferencesComposite.refresh();
-            cxf21WSDL2JavaPreferencesComposite.refresh();
-        } else {
-            java2WSDLRuntimePreferencesComposite.refresh();
-            cxf20WSDL2JavaPreferencesComposite.refresh();
-        }
-    }
-    
-    private void storeValues() {
-        context.setExportCXFClasspathContainer(exportCXFClasspathContainerButton.getSelection());
-        
-        if (context.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            java2WSRuntimePreferencesComposite.storeValues();
-            cxf21WSDL2JavaPreferencesComposite.storeValues();
-        } else {
-            java2WSDLRuntimePreferencesComposite.storeValues();
-            cxf20WSDL2JavaPreferencesComposite.storeValues();
-        }
-        annotationsComposite.storeValues();
-        springConfigComposite.storeValues();
-    }
-    
-    @Override
-    protected void performApply() {
-        super.performApply();
-    }
-
-    @Override
-    public boolean performCancel() {
-        return super.performCancel();
-    }
-
-    @Override
-    protected void performDefaults() {
-        super.performDefaults();
-        setDefaults();
-    }
-
-    @Override
-    public boolean performOk() {
-        storeValues();
-        return true;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.java
deleted file mode 100644
index cfd0900..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameColumnLabelProvider.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.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-
-/**
- * @author sclarke
- */
-public class PackageNameColumnLabelProvider extends ColumnLabelProvider {
-    private Map<String, String> includedNamespaces;
-
-    public PackageNameColumnLabelProvider(WSDL2JavaDataModel model) {
-        includedNamespaces = model.getIncludedNamespaces();
-    }
-
-    @Override
-    public String getText(Object element) {
-        if (includedNamespaces.containsKey(element.toString())) {
-            return includedNamespaces.get(element.toString());
-        }
-        return WSDLUtils.getPackageNameFromNamespace(element.toString());
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
deleted file mode 100644
index 28cf8d1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameEditingSupport.java
+++ /dev/null
@@ -1,89 +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.ui.viewers;
-
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.jaxws.core.utils.WSDLUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class PackageNameEditingSupport extends EditingSupport implements SelectionListener {
-    private CellEditor packageNameCellEditor;
-    private Table table;
-    private Map<String, String> includedNamespaces;
-
-    public PackageNameEditingSupport(TableViewer tableViewer, CellEditor packageNameCellEditor,
-            WSDL2JavaDataModel model) {
-        super(tableViewer);
-        this.table = tableViewer.getTable();
-        this.packageNameCellEditor = packageNameCellEditor;
-        includedNamespaces = model.getIncludedNamespaces();
-        table.addSelectionListener(this);
-    }
-
-    @Override
-    protected boolean canEdit(Object element) {
-        return table.getSelection()[0].getChecked();
-    }
-
-    @Override
-    protected CellEditor getCellEditor(Object element) {
-        return packageNameCellEditor;
-    }
-
-    @Override
-    protected Object getValue(Object element) {
-        if (includedNamespaces.containsKey(element.toString())) {
-            return includedNamespaces.get(element.toString());
-        }
-        return WSDLUtils.getPackageNameFromNamespace(element.toString());
-    }
-
-    @Override
-    protected void setValue(Object namespace, Object packageName) {
-        if (namespace != null && packageName != null) {
-            includedNamespaces.put(namespace.toString(), packageName.toString());
-            getViewer().update(namespace, null);
-        }
-    }
-
-    public void widgetSelected(SelectionEvent event) {
-        if (event.detail == SWT.CHECK) {
-            TableItem item = (TableItem) event.item;
-            String namespaceKey = item.getText(0);
-            String packageName = item.getText(1);
-            if (item.getChecked()) {
-                if (!includedNamespaces.containsKey(namespaceKey)) {
-                    includedNamespaces.put(namespaceKey, packageName);
-                }
-            } else {
-                if (includedNamespaces.containsKey(namespaceKey)) {
-                    includedNamespaces.remove(namespaceKey);
-                }
-            }
-        }
-    }
-
-    public void widgetDefaultSelected(SelectionEvent event) {
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
deleted file mode 100644
index d070109..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/viewers/PackageNameTableContentProvider.java
+++ /dev/null
@@ -1,51 +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.ui.viewers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * @author sclarke
- */
-public class PackageNameTableContentProvider implements IStructuredContentProvider {
-
-    @SuppressWarnings("unchecked")
-    public Object[] getElements(Object inputElement) {
-        List<Object> elements = new ArrayList<Object>();
-        if (inputElement instanceof Definition) {
-            Definition definition = (Definition) inputElement;
-            Map namespaces = definition.getNamespaces();
-            Collection values = namespaces.values();
-            for (Object namespaceValue : values) {
-                String namespace = namespaceValue.toString();
-                if (!namespace.equals(definition.getTargetNamespace()) && !elements.contains(namespace)) {
-                    elements.add(namespace);
-                }
-            }
-        }
-        return elements.toArray(new Object[elements.size()]);
-    }
-
-	public void dispose() {
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
deleted file mode 100644
index f97afe3..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/AnnotationsComposite.java
+++ /dev/null
@@ -1,149 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsComposite extends Composite {
-    private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-    
-    private Button generateWebMethodButton;
-    private Button generateWebParamButton;
-    private Button generateRequestWrapperButton;
-    private Button generateResponseWrapperButton;
-
-    private Button enableAPTButton;
-    
-    public AnnotationsComposite(Composite parent, int style) {
-        super(parent, style);
-        addControls();
-    }
-
-    private void addControls() {
-        GridLayout preflayout = new GridLayout(1, true);
-        this.setLayout(preflayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        Group jaxwsAnnotationsGroup = new Group(this, SWT.SHADOW_IN);
-        jaxwsAnnotationsGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_LABEL);
-        jaxwsAnnotationsGroup.setToolTipText(CXFUIMessages.JAXWS_ANNOTATIONS_GROUP_TOOLTIP);
-        GridLayout gridLayout = new GridLayout(1, true);
-        jaxwsAnnotationsGroup.setLayout(gridLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        jaxwsAnnotationsGroup.setLayoutData(gridData);
-
-        generateWebMethodButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
-        generateWebMethodButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_METHOD);
-        generateWebMethodButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setGenerateWebMethodAnnotation(selected);
-            }
-        });
-        generateWebMethodButton.setSelection(context.isGenerateWebMethodAnnotation());
-        
-        generateWebParamButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
-        generateWebParamButton.setText(CXFUIMessages.JAXWS_GENERATE_WEB_PARAM);
-        generateWebParamButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setGenerateWebParamAnnotation(selected);
-            }
-        });
-        generateWebParamButton.setSelection(context.isGenerateWebParamAnnotation());
-        
-        generateRequestWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
-        generateRequestWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_REQUEST_WRAPPER);
-        generateRequestWrapperButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setGenerateRequestWrapperAnnotation(selected);
-            }
-        });
-        generateRequestWrapperButton.setSelection(context.isGenerateRequestWrapperAnnotation());
-        
-        generateResponseWrapperButton = new Button(jaxwsAnnotationsGroup, SWT.CHECK);
-        generateResponseWrapperButton.setText(CXFUIMessages.JAXWS_GENERATE_RESPONSE_WRAPPER);
-        generateResponseWrapperButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setGenerateResponseWrapperAnnotation(selected);
-            }
-        });
-        generateResponseWrapperButton.setSelection(context.isGenerateResponseWrapperAnnotation());
-
-        Group annotationProcessingGroup = new Group(this, SWT.SHADOW_IN);
-        annotationProcessingGroup.setText(CXFUIMessages.JAXWS_ANNOTATIONS_PROCESSING_GROUP_LABEL);
-        annotationProcessingGroup.setToolTipText(CXFUIMessages.bind(
-                CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING_TOOLTIP, 
-                context.getCxfRuntimeEdition()));
-        gridLayout = new GridLayout(1, true);
-        annotationProcessingGroup.setLayout(gridLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        annotationProcessingGroup.setLayoutData(gridData);
-
-        enableAPTButton = new Button(annotationProcessingGroup, SWT.CHECK);
-        enableAPTButton.setText(CXFUIMessages.JAXWS_ENABLE_ANNOTATION_PROCESSING);
-        enableAPTButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setAnnotationProcessingEnabled(selected);
-            }
-        });
-        enableAPTButton.setSelection(context.isAnnotationProcessingEnabled());
-    }
-
-    public void setDefaults() {
-        generateWebMethodButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_METHOD_ANNOTATION));
-        
-        generateWebParamButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WEB_PARAM_ANNOTATION));
-        
-        generateRequestWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, 
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_REQUEST_WRAPPER_ANNOTATION));
-        
-        generateResponseWrapperButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_RESPONSE_WRAPPER_ANNOTATION));
-        
-        enableAPTButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__ANNOTATION_PROCESSING_ENABLED));
-    }
-    
-    public void storeValues() {
-        context.setGenerateWebMethodAnnotation(generateWebMethodButton.getSelection());
-        context.setGenerateWebParamAnnotation(generateWebParamButton.getSelection());
-        context.setGenerateRequestWrapperAnnotation(generateRequestWrapperButton.getSelection());
-        context.setGenerateResponseWrapperAnnotation(generateResponseWrapperButton.getSelection());
-        context.setAnnotationProcessingEnabled(enableAPTButton.getSelection());
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
deleted file mode 100644
index 91824e7..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/BlankRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,43 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-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.custom.CLabel;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author sclarke
- */
-public class BlankRuntimePreferencesComposite extends Composite {
-
-    public BlankRuntimePreferencesComposite(Composite parent, int style) {
-        super(parent, style);
-
-        addControls();
-    }
-
-    private void addControls() {
-        this.setLayout(new GridLayout());
-        CLabel setIntallDirLabel = new CLabel(this, SWT.NONE);
-        GridData gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
-        setIntallDirLabel.setLayoutData(gridData);
-        setIntallDirLabel.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(
-                ISharedImages.IMG_OBJS_ERROR_TSK));
-        setIntallDirLabel.setText(CXFUIMessages.CXF_RUNTIME_PREFERENCE_PAGE_RUNTIME_NOT_SET);
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index f918e3b..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF20WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,200 +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.ui.widgets;
-
-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.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class CXF20WSDL2JavaPreferencesComposite extends Composite {
-    WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
-    private Button generateServerButton;
-    private Button generateImplementationButton;
-    private Button processSOAPHeadersButton;
-    private Button namespacePackageMappingButton;
-    private Button excludesNamespaceMappingButton;
-
-    private Button useDefaultValuesButton;
-    private Button autoNameResolutionButton;
-
-    private Table xjcArgsTable;
-
-    private TableItem xjcDefaultValuesTableItem;
-    private TableItem xjcToStringTableItem;
-    private TableItem xjcToStringMultiLineTableItem;
-    private TableItem xjcToStringSimpleTableItem;
-    private TableItem xjcLocatorTableItem;
-    private TableItem xjcSyncMethodsTableItem;
-    private TableItem xjcMarkGeneratedTableItem;
-
-    public CXF20WSDL2JavaPreferencesComposite(Composite parent, int style) {
-        super(parent, style);
-    }
-
-    public void addControls() {
-        GridLayout preflayout = new GridLayout(1, true);
-        this.setLayout(preflayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
-        wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
-        GridLayout wsdl2javalayout = new GridLayout(1, true);
-        wsdl2javaGroup.setLayout(wsdl2javalayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdl2javaGroup.setLayoutData(gridData);
-
-        generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
-        generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
-                wsdl2javaGroup, context);
-        
-        useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
-
-        processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
-                context);
-
-        namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
-                wsdl2javaGroup, context);
-
-        excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
-                wsdl2javaGroup, context);
-        
-        if (CXFModelUtils.isAutoNameResolutionPermitted()) {
-            autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup,
-                    context);
-        }
-
-        Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
-        xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
-        GridLayout xjcArgLayout = new GridLayout(1, true);
-        xjcArgGroup.setLayout(xjcArgLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xjcArgGroup.setLayoutData(gridData);
-
-        xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        xjcArgsTable.setLayoutData(gridData);
-
-        xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
-                context);
-        xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
-        xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
-                xjcArgsTable, context);
-        xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
-                context);
-        xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
-        xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
-        xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
-                context);
-    }
-
-    public void setDefaults() {
-        useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-
-        generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-        generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-        processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-        namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-        excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
-        if (canUpdateAutoNameResolution()) {
-            autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
-        }
-
-        xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-        xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-        xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-        xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-        xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-        xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-        xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
-    }
-    
-    public void refresh() {
-        useDefaultValuesButton.setSelection(context.isUseDefaultValues());
-        generateServerButton.setSelection(context.isGenerateServer());
-        generateImplementationButton.setSelection(context.isGenerateImplementation());
-        processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
-        namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
-        excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-        
-        if (canUpdateAutoNameResolution()) {
-            autoNameResolutionButton.setSelection(context.isAutoNameResolution());
-        }
-        
-        xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
-        xjcToStringTableItem.setChecked(context.isXjcToString());
-        xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
-        xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
-        xjcLocatorTableItem.setChecked(context.isXjcLocator());
-        xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
-        xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
-    }
-    
-    public void storeValues() {
-        context.setUseDefaultValues(useDefaultValuesButton.getSelection());
-        context.setGenerateServer(generateServerButton.getSelection());
-        context.setGenerateImplementation(generateImplementationButton.getSelection());
-        context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
-        context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
-        context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-        
-        if (canUpdateAutoNameResolution()) {
-            context.setAutoNameResolution(autoNameResolutionButton.getSelection());
-        }
-        
-        context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
-        context.setXjcToString(xjcToStringTableItem.getChecked());
-        context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
-        context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
-        context.setXjcLocator(xjcLocatorTableItem.getChecked());
-        context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
-        context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
-    }
-    
-    private boolean canUpdateAutoNameResolution() {
-        return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
deleted file mode 100644
index b856865..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/CXF21WSDL2JavaPreferencesComposite.java
+++ /dev/null
@@ -1,267 +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.ui.widgets;
-
-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.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author sclarke
- */
-public class CXF21WSDL2JavaPreferencesComposite extends Composite {
-    WSDL2JavaContext context = CXFCorePlugin.getDefault().getWSDL2JavaContext();
-
-    private Button generateServerButton;
-    private Button generateImplementationButton;
-    private Button processSOAPHeadersButton;
-    private Button namespacePackageMappingButton;
-    private Button excludesNamespaceMappingButton;
-
-    private Table xjcArgsTable;
-
-    private TableItem xjcDefaultValuesTableItem;
-    private TableItem xjcToStringTableItem;
-    private TableItem xjcToStringMultiLineTableItem;
-    private TableItem xjcToStringSimpleTableItem;
-    private TableItem xjcLocatorTableItem;
-    private TableItem xjcSyncMethodsTableItem;
-    private TableItem xjcMarkGeneratedTableItem;
-
-    private Button useDefaultValuesButton;
-    private Button noAddressBindingButton;
-    private Button autoNameResolutionButton;
-
-    public CXF21WSDL2JavaPreferencesComposite(Composite parent, int style) {
-        super(parent, style);
-    }
-
-    public void addControls() {
-        GridLayout preflayout = new GridLayout(1, true);
-        this.setLayout(preflayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        Group wsdl2javaGroup = new Group(this, SWT.SHADOW_IN);
-        wsdl2javaGroup.setText(CXFUIMessages.WSDL2JAVA_GROUP_LABEL);
-        GridLayout wsdl2javalayout = new GridLayout(2, false);
-        wsdl2javaGroup.setLayout(wsdl2javalayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        wsdl2javaGroup.setLayoutData(gridData);
-
-        // Frontend
-        // WSDL2JavaWidgetFactory.createFrontendLabel(wsdl2javaGroup);
-        // Combo frontendCombo =
-        // WSDL2JavaWidgetFactory.createFrontendCombo(wsdl2javaGroup, context);
-        // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        // frontendCombo.setLayoutData(gridData);
-
-        // Databinding
-        // WSDL2JavaWidgetFactory.createDatabindingLabel(wsdl2javaGroup);
-        // Combo databindingCombo =
-        // WSDL2JavaWidgetFactory.createDatabindingCombo(wsdl2javaGroup,
-        // context);
-        // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        // databindingCombo.setLayoutData(gridData);
-
-        // WSDL Version
-        // WSDL2JavaWidgetFactory. createWSDLVersionLabel(wsdl2javaGroup);
-        // Combo wsdlVersionCombo =
-        // WSDL2JavaWidgetFactory.createWSDLVersionCombo(wsdl2javaGroup,
-        // context);
-        // gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        // wsdlVersionCombo.setLayoutData(gridData);
-
-        generateServerButton = WSDL2JavaWidgetFactory.createGenerateServerButton(wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        generateServerButton.setLayoutData(gridData);
-
-        generateImplementationButton = WSDL2JavaWidgetFactory.createGenerateImplementationButton(
-                wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        generateImplementationButton.setLayoutData(gridData);
-
-        useDefaultValuesButton = WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        useDefaultValuesButton.setLayoutData(gridData);
-        
-        processSOAPHeadersButton = WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup,
-                context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        processSOAPHeadersButton.setLayoutData(gridData);
-
-        namespacePackageMappingButton = WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(
-                wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        namespacePackageMappingButton.setLayoutData(gridData);
-
-        excludesNamespaceMappingButton = WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(
-                wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        excludesNamespaceMappingButton.setLayoutData(gridData);
-
-        if (CXFModelUtils.isAutoNameResolutionPermitted()) {
-            autoNameResolutionButton = WSDL2JavaWidgetFactory.createAutoNameResolutionButton(wsdl2javaGroup, context);
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-            gridData.horizontalSpan = 2;
-            autoNameResolutionButton.setLayoutData(gridData);
-        }
-        
-        noAddressBindingButton = WSDL2JavaWidgetFactory.createNoAddressBindingButton(wsdl2javaGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        noAddressBindingButton.setLayoutData(gridData);
-        
-        Group xjcArgGroup = new Group(this, SWT.SHADOW_IN);
-        xjcArgGroup.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_GROUP_TITLE);
-        GridLayout xjcArgLayout = new GridLayout(1, true);
-        xjcArgGroup.setLayout(xjcArgLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        xjcArgGroup.setLayoutData(gridData);
-
-        xjcArgsTable = WSDL2JavaWidgetFactory.createXJCArgTable(xjcArgGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gridData.horizontalSpan = 3;
-        gridData.verticalSpan = 6;
-        xjcArgsTable.setLayoutData(gridData);
-
-        xjcDefaultValuesTableItem = WSDL2JavaWidgetFactory.createXJCDefaultValuesTableItem(xjcArgsTable,
-                context);
-        xjcToStringTableItem = WSDL2JavaWidgetFactory.createXJCToStringTableItem(xjcArgsTable, context);
-        xjcToStringMultiLineTableItem = WSDL2JavaWidgetFactory.createXJCToStringMultiLineTableItem(
-                xjcArgsTable, context);
-        xjcToStringSimpleTableItem = WSDL2JavaWidgetFactory.createXJCToStringSimpleTableItem(xjcArgsTable,
-                context);
-        xjcLocatorTableItem = WSDL2JavaWidgetFactory.createXJCLocatorTableItem(xjcArgsTable, context);
-        xjcSyncMethodsTableItem = WSDL2JavaWidgetFactory.createXJCSyncMethodsTableItem(xjcArgsTable, context);
-        xjcMarkGeneratedTableItem = WSDL2JavaWidgetFactory.createXJCMarkGeneratedTableItem(xjcArgsTable,
-                context);
-    }
-
-    public void setDefaults() {
-        useDefaultValuesButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__USE_DEFAULT_VALUES));
-        
-        noAddressBindingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__NO_ADDRESS_BINDING));
-
-        generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-        
-        generateImplementationButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__GENERATE_IMPLEMENTATION));
-        
-        processSOAPHeadersButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__PROCESS_SOAP_HEADERS));
-        
-        namespacePackageMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_NAMESPACE_PACKAGE_NAME_MAPPING));
-        
-        excludesNamespaceMappingButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__LOAD_DEFAULT_EXCLUDES_NAMEPSACE_MAPPING));
-
-        if (canUpdateAutoNameResolution()) {
-            autoNameResolutionButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__AUTO_NAME_RESOLUTION));
-        }
-        
-        xjcDefaultValuesTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_USE_DEFAULT_VALUES));
-        
-        xjcToStringTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING));
-        
-        xjcToStringMultiLineTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_MULTI_LINE));
-        
-        xjcToStringSimpleTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_TO_STRING_SIMPLE));
-        
-        xjcLocatorTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(CXFPackage.WSDL2_JAVA_CONTEXT,
-                CXFPackage.WSDL2_JAVA_CONTEXT__XJC_LOCATOR));
-        
-        xjcSyncMethodsTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_SYNC_METHODS));
-        
-        xjcMarkGeneratedTableItem.setChecked(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.WSDL2_JAVA_CONTEXT, CXFPackage.WSDL2_JAVA_CONTEXT__XJC_MARK_GENERATED));
-    }
-    
-    public void refresh() {
-        useDefaultValuesButton.setSelection(context.isUseDefaultValues());
-        noAddressBindingButton.setSelection(context.isNoAddressBinding());
-        
-        if (canUpdateAutoNameResolution()) {
-            autoNameResolutionButton.setSelection(context.isAutoNameResolution());
-        }
-        
-        generateServerButton.setSelection(context.isGenerateServer());
-        generateImplementationButton.setSelection(context.isGenerateImplementation());
-        processSOAPHeadersButton.setSelection(context.isProcessSOAPHeaders());
-        namespacePackageMappingButton.setSelection(context.isLoadDefaultNamespacePackageNameMapping());
-        excludesNamespaceMappingButton.setSelection(context.isLoadDefaultExcludesNamepsaceMapping());
-
-        xjcDefaultValuesTableItem.setChecked(context.isXjcUseDefaultValues());
-        xjcToStringTableItem.setChecked(context.isXjcToString());
-        xjcToStringMultiLineTableItem.setChecked(context.isXjcToStringMultiLine());
-        xjcToStringSimpleTableItem.setChecked(context.isXjcToStringSimple());
-        xjcLocatorTableItem.setChecked(context.isXjcLocator());
-        xjcSyncMethodsTableItem.setChecked(context.isXjcSyncMethods());
-        xjcMarkGeneratedTableItem.setChecked(context.isXjcMarkGenerated());
-    }
-    
-    public void storeValues() {
-        context.setUseDefaultValues(useDefaultValuesButton.getSelection());
-        context.setNoAddressBinding(noAddressBindingButton.getSelection());
-        
-        if (canUpdateAutoNameResolution()) {
-            context.setAutoNameResolution(autoNameResolutionButton.getSelection());
-        }
-        
-        context.setGenerateServer(generateServerButton.getSelection());
-        context.setGenerateImplementation(generateImplementationButton.getSelection());
-        context.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
-        context.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
-        context.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-
-        context.setXjcUseDefaultValues(xjcDefaultValuesTableItem.getChecked());
-        context.setXjcToString(xjcToStringTableItem.getChecked());
-        context.setXjcToStringMultiLine(xjcToStringMultiLineTableItem.getChecked());
-        context.setXjcToStringSimple(xjcToStringSimpleTableItem.getChecked());
-        context.setXjcLocator(xjcLocatorTableItem.getChecked());
-        context.setXjcSyncMethods(xjcSyncMethodsTableItem.getChecked());
-        context.setXjcMarkGenerated(xjcMarkGeneratedTableItem.getChecked());
-    }
-    
-    private boolean canUpdateAutoNameResolution() {
-        return autoNameResolutionButton != null && CXFModelUtils.isAutoNameResolutionPermitted();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
deleted file mode 100644
index c9d1d42..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSDLRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,110 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * @author sclarke
- */
-public class Java2WSDLRuntimePreferencesComposite extends Composite {
-    private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
-    private Combo soapBindingCombo;
-    private Button createXSDImportsButton;    
-    private TabFolder tabFolder;
-    
-    public Java2WSDLRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
-        super(parent, style);
-        this.tabFolder = tabFolder;
-    }
-
-    public void addControls() {
-        GridLayout preflayout = new GridLayout(1, true);
-        this.setLayout(preflayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        Group java2wsdlGroup = new Group(this, SWT.SHADOW_IN);
-        java2wsdlGroup.setText(CXFUIMessages.JAVA2WSDL_GROUP_LABEL);
-        GridLayout java2wslayout = new GridLayout();
-        java2wslayout.numColumns = 2;
-        java2wsdlGroup.setLayout(java2wslayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        java2wsdlGroup.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createSOAPBindingLabel(java2wsdlGroup);
-
-        soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(java2wsdlGroup, context);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        soapBindingCombo.setLayoutData(gridData);
-
-        createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(java2wsdlGroup, context);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 2;
-        createXSDImportsButton.setLayoutData(gridData);
-        
-        Link link = new Link(this, SWT.NONE);
-        link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
-        link.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                tabFolder.setSelection(3); 
-            }
-        });
-    }
-    
-    public void setDefaults() {
-        if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
-        }
-
-        createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-    }
-    
-    public void refresh() {
-        if (context.isSoap12Binding()) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$    
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$            
-        }
-        createXSDImportsButton.setSelection(context.isGenerateXSDImports());
-    }
-    
-    public void storeValues() {
-        if (soapBindingCombo.getText().equals("SOAP 1.2")) {
-            context.setSoap12Binding(true);
-        } else {
-            context.setSoap12Binding(false);
-        }
-
-        context.setGenerateXSDImports(createXSDImportsButton.getSelection());
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
deleted file mode 100644
index 516f43e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSRuntimePreferencesComposite.java
+++ /dev/null
@@ -1,193 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.context.Java2WSPersistentContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.TabFolder;
-
-/**
- * @author sclarke
- */
-public class Java2WSRuntimePreferencesComposite extends Composite {
-    private Java2WSPersistentContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-    
-    private Combo soapBindingCombo;
-    private Button createXSDImportsButton;
-
-    private Button generateClientButton;
-    private Button generateServerButton;
-    private Button generateWrapperFaultBeanButton;
-    private Button generateWSDLButton;
-    
-    private TabFolder tabFolder;
-    
-    public Java2WSRuntimePreferencesComposite(Composite parent, int style, TabFolder tabFolder) {
-        super(parent, style);
-        this.tabFolder = tabFolder;
-    }
-
-    public void addControls() {
-        GridLayout preflayout = new GridLayout();
-
-        preflayout.numColumns = 2;
-        preflayout.marginHeight = 10;
-        this.setLayout(preflayout);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        // Java2WS Group
-        Group java2wsGroup = new Group(this, SWT.SHADOW_IN);
-        java2wsGroup.setText(CXFUIMessages.JAVA2WS_GROUP_LABEL);
-        GridLayout java2wslayout = new GridLayout();
-
-        java2wslayout.numColumns = 3;
-
-        java2wslayout.marginHeight = 10;
-        java2wsGroup.setLayout(java2wslayout);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 2;
-        java2wsGroup.setLayoutData(gridData);
-
-        // Frontend
-        Java2WSWidgetFactory.createFrontendLabel(java2wsGroup);
-        Combo frontendCombo = Java2WSWidgetFactory.createFrontendCombo(java2wsGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        frontendCombo.setLayoutData(gridData);
-
-        // Databinding
-        Java2WSWidgetFactory.createDatabindingLabel(java2wsGroup);
-        Combo databindingCombo = Java2WSWidgetFactory.createDatabindingCombo(java2wsGroup, context);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        databindingCombo.setLayoutData(gridData);
-
-        // Gen Client
-        generateClientButton = Java2WSWidgetFactory.createGenerateClientButton(java2wsGroup, context);
-
-        // Gen Server
-        generateServerButton = Java2WSWidgetFactory.createGenerateServerButton(java2wsGroup, context);
-
-        // Gen Wrapper and Fault Bean
-        generateWrapperFaultBeanButton = Java2WSWidgetFactory.createGenerateWrapperFaultBeanButton(
-                java2wsGroup, context);
-
-        // Gen WSDL
-        generateWSDLButton = Java2WSWidgetFactory.createGenerateWSDLButton(java2wsGroup, context);
-        generateWSDLButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                enableWSDLGroup(generateWSDLButton.getSelection());
-            }
-        });
-
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 3;
-        generateWSDLButton.setLayoutData(gridData);
-
-        Group wsdlGroup = new Group(java2wsGroup, SWT.SHADOW_ETCHED_IN);
-        GridLayout wsdlGroupLayout = new GridLayout(2, false);
-        wsdlGroup.setLayout(wsdlGroupLayout);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 3;
-        wsdlGroup.setLayoutData(gridData);
-
-        Java2WSWidgetFactory.createSOAPBindingLabel(wsdlGroup);
-
-        soapBindingCombo = Java2WSWidgetFactory.createSOAPBingCombo(wsdlGroup, context);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        soapBindingCombo.setLayoutData(gridData);
-
-        createXSDImportsButton = Java2WSWidgetFactory.createXSDImportsButton(wsdlGroup, context);
-        gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 2;
-        createXSDImportsButton.setLayoutData(gridData);
-        
-        Link link = new Link(this, SWT.NONE);
-        link.setText(CXFUIMessages.ANNOTATIONS_PREFERENCES_LINK);
-        link.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                tabFolder.setSelection(3); 
-            }
-        });
-        enableWSDLGroup(context.isGenerateWSDL());
-    }
-
-    protected void enableWSDLGroup(boolean enable) {
-        soapBindingCombo.setEnabled(enable);
-        createXSDImportsButton.setEnabled(enable);
-    }
-    
-    public void setDefaults() {
-        if (CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__SOAP12_BINDING)) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
-        }
-        
-        createXSDImportsButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_XSD_IMPORTS));
-
-        generateClientButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__GENERATE_CLIENT));
-        
-        generateServerButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__GENERATE_SERVER));
-        
-        generateWrapperFaultBeanButton.setSelection(CXFModelUtils.getDefaultBooleanValue(
-                CXFPackage.JAVA2_WS_CONTEXT, CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WRAPPER_FAULT_BEANS));
-        
-        generateWSDLButton.setSelection(CXFModelUtils.getDefaultBooleanValue(CXFPackage.JAVA2_WS_CONTEXT,
-                CXFPackage.JAVA2_WS_CONTEXT__GENERATE_WSDL));
-    }
-    
-    public void refresh() {
-        if (context.isSoap12Binding()) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$    
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$            
-        }
-
-        createXSDImportsButton.setSelection(context.isGenerateXSDImports());
-        generateClientButton.setSelection(context.isGenerateClient());
-        generateServerButton.setSelection(context.isGenerateServer());
-        generateWrapperFaultBeanButton.setSelection(context.isGenerateWrapperFaultBeans());
-        generateWSDLButton.setSelection(context.isGenerateWSDL());
-    }
-    
-    public void storeValues() {
-        if (soapBindingCombo.getText().equals("SOAP 1.2")) {
-            context.setSoap12Binding(true);
-        } else {
-            context.setSoap12Binding(false);
-        }
-
-        context.setGenerateXSDImports(createXSDImportsButton.getSelection());
-        context.setGenerateClient(generateClientButton.getSelection());
-        context.setGenerateServer(generateServerButton.getSelection());
-        context.setGenerateWrapperFaultBeans(generateWrapperFaultBeanButton.getSelection());
-        context.setGenerateWSDL(generateWSDLButton.getSelection());
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
deleted file mode 100644
index 0e2f1da..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/Java2WSWidgetFactory.java
+++ /dev/null
@@ -1,357 +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.ui.widgets;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.ws.internal.cxf.core.model.DataBinding;
-import org.eclipse.jst.ws.internal.cxf.core.model.Frontend;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.Java2WSDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-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.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.Text;
-
-/**
- * Provides widgets for Java2WS preferences, wizards, dialogs. Enables the reuse
- * of widgets in multiple locations. Widgets have there labeling and tooltips
- * set here and where possible listeners are set which update instances of
- * <code>Java2WSContext</code> and <code>Java2WSDataModel</code>.
- * 
- * @author sclarke
- */
-public final class Java2WSWidgetFactory {
-
-    private Java2WSWidgetFactory() {
-    }
-
-    public static Label createSOAPBindingLabel(Composite parent) {
-        Label defaultSoapBinding = new Label(parent, SWT.NONE);
-        defaultSoapBinding.setText(CXFUIMessages.JAVA2WS_DEFAULT_SOAPBINDING_LABEL);
-        return defaultSoapBinding;
-    }
-
-    public static Combo createSOAPBingCombo(Composite parent, final Java2WSContext context) {
-        Combo soapBindingCombo = new Combo(parent, SWT.READ_ONLY);
-        soapBindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_SOAP12_BINDING_TOOLTIP);
-        soapBindingCombo.add("SOAP 1.1"); //$NON-NLS-1$
-        soapBindingCombo.add("SOAP 1.2"); //$NON-NLS-1$
-        soapBindingCombo.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                String soapBinding = ((Combo) e.widget).getText();
-                if (soapBinding.equals("SOAP 1.2")) { //$NON-NLS-1$
-                    context.setSoap12Binding(true);
-                } else {
-                    context.setSoap12Binding(false);
-                }
-            }
-        });
-        if (context.isSoap12Binding()) {
-            soapBindingCombo.setText("SOAP 1.2"); //$NON-NLS-1$
-        } else {
-            soapBindingCombo.setText("SOAP 1.1"); //$NON-NLS-1$
-        }
-
-        return soapBindingCombo;
-    }
-
-    public static Button createXSDImportsButton(Composite parent, final Java2WSContext context) {
-        Button createXSDImports = new Button(parent, SWT.CHECK);
-        createXSDImports.setText(CXFUIMessages.JAVA2WS_GEN_XSD_IMPORTS);
-        createXSDImports.setToolTipText(CXFUIMessages.JAVA2WS_CREATE_XSD_IMPORTS_TOOLTIP);
-        createXSDImports.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setGenerateXSDImports(((Button) e.widget).getSelection());
-            }
-        });
-        createXSDImports.setSelection(context.isGenerateXSDImports());
-        return createXSDImports;
-    }
-
-    public static Label createFrontendLabel(Composite parent) {
-        Label frontendLabel = new Label(parent, SWT.NONE);
-        frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
-        return frontendLabel;
-    }
-
-    public static Combo createFrontendCombo(Composite parent, final Java2WSContext context) {
-        final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
-        frontendCombo.setToolTipText(CXFUIMessages.JAVA2WS_FRONTEND_TOOLTIP);
-        frontendCombo.add(Frontend.JAXWS.getLiteral());
-        frontendCombo.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                String frontend = frontendCombo.getText();
-                context.setFrontend(Frontend.get(frontend));
-                if (frontend.equals(Frontend.JAXWS.getLiteral())) {
-                    context.setDatabinding(DataBinding.get(DataBinding.JAXB.getLiteral()));
-                }
-//                if (frontend.equals("simple")) {
-//                    context.setDatabinding("aegis");
-//                }
-            }
-        });
-        frontendCombo.setText(context.getFrontend().getLiteral());
-
-        return frontendCombo;
-    }
-
-    public static Label createDatabindingLabel(Composite parent) {
-        Label databindingLabel = new Label(parent, SWT.NONE);
-        databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
-        return databindingLabel;
-    }
-
-    public static Combo createDatabindingCombo(Composite parent, final Java2WSContext context) {
-        final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
-        databindingCombo.setToolTipText(CXFUIMessages.JAVA2WS_DATABINDING_TOOLTIP);
-        databindingCombo.add(DataBinding.JAXB.getLiteral());
-        databindingCombo.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setDatabinding(DataBinding.get(databindingCombo.getText()));
-            }
-        });
-        databindingCombo.setText(context.getDatabinding().getLiteral());
-        return databindingCombo;
-    }
-
-    public static Button createGenerateClientButton(Composite parent, final Java2WSContext context) {
-        final Button genClientButton = new Button(parent, SWT.CHECK);
-        genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
-        genClientButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_CLIENT_TOOLTIP);
-        genClientButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setGenerateClient(genClientButton.getSelection());
-            }
-        });
-        genClientButton.setSelection(context.isGenerateClient());
-        return genClientButton;
-    }
-
-    public static Button createGenerateServerButton(Composite parent, final Java2WSContext context) {
-        final Button genServerButton = new Button(parent, SWT.CHECK);
-        genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
-        genServerButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_SERVER_TOOLTIP);
-        genServerButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setGenerateServer(genServerButton.getSelection());
-            }
-        });
-        genServerButton.setSelection(context.isGenerateServer());
-        return genServerButton;
-    }
-
-    public static Button createGenerateWrapperFaultBeanButton(Composite parent, final Java2WSContext context) {
-        final Button genWrapperFaultButton = new Button(parent, SWT.CHECK);
-        genWrapperFaultButton.setText(CXFUIMessages.JAVA2WS_GEN_WRAPPER_FAULT_LABEL);
-        genWrapperFaultButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WRAPPERBEAN_TOOLTIP);
-        genWrapperFaultButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setGenerateWrapperFaultBeans(genWrapperFaultButton.getSelection());
-            }
-        });
-        genWrapperFaultButton.setSelection(context.isGenerateWrapperFaultBeans());
-        return genWrapperFaultButton;
-    }
-
-    public static Button createGenerateWSDLButton(Composite parent, final Java2WSContext context) {
-        final Button genWSDLButton = new Button(parent, SWT.CHECK);
-        genWSDLButton.setText(CXFUIMessages.JAVA2WS_GEN_WSDL_LABEL);
-        genWSDLButton.setToolTipText(CXFUIMessages.JAVA2WS_GENERATE_WSDL_TOOLTIP);
-        genWSDLButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                context.setGenerateWSDL(genWSDLButton.getSelection());
-            }
-        });
-        genWSDLButton.setSelection(context.isGenerateWSDL());
-        return genWSDLButton;
-    }
-
-    public static Label createWSDLFileNameLabel(Composite parent) {
-        Label wsdlFileNameLabel = new Label(parent, SWT.NONE);
-        wsdlFileNameLabel.setText(CXFUIMessages.JAVA2WS_WSDL_FILE_NAME);
-        return wsdlFileNameLabel;
-
-    }
-
-    public static Text createWSDLFileNameText(Composite parent, final Java2WSDataModel model) {
-        final Text wsdlFileText = new Text(parent, SWT.BORDER);
-        wsdlFileText.setToolTipText(CXFUIMessages.JAVA2WS_OUTPUT_FILE_TOOLTIP);
-        wsdlFileText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                model.setWsdlFileName(wsdlFileText.getText());
-            }
-        });
-        wsdlFileText.setText(model.getWsdlFileName());
-        return wsdlFileText;
-    }
-
-    public static Button createUseSEIButton(Composite parent) {
-        Button useSEIButton = new Button(parent, SWT.CHECK);
-        useSEIButton.setText(CXFUIMessages.JAVA2WS_USE_SEI_BUTTON);
-        return useSEIButton;
-    }
-
-    public static Label createInformationLabel(Composite parent, IType startingPointType) {
-        Label infoLabel = new Label(parent, SWT.WRAP);
-        infoLabel.setText(CXFUIMessages.bind(CXFUIMessages.JAVA2WS_USE_SEI_INFO_LABEL, startingPointType
-                .getElementName()));
-        return infoLabel;
-    }
-
-    public static Label createPaddingLabel(Composite parent) {
-        return new Label(parent, SWT.NONE);
-    }
-
-    public static Button createSelectSEIButton(Composite parent) {
-        Button selectSEIButton = new Button(parent, SWT.RADIO);
-        selectSEIButton.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
-        return selectSEIButton;
-    }
-
-    public static Label createSelectSEILabel(Composite parent) {
-        Label selectSEILabel = new Label(parent, SWT.NONE);
-        selectSEILabel.setText(CXFUIMessages.JAVA2WS_SELECT_SEI_LABEL);
-        return selectSEILabel;
-    }
-
-    public static Combo createSelectSEICombo(Composite parent, final Java2WSDataModel model,
-            IType javaStartingPointType) {
-        final Combo seiCombo = new Combo(parent, SWT.READ_ONLY);
-        seiCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_SEI_TOOLTIP);
-
-        IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
-        try {
-            ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
-            IType[] allInterfaces = typeHierarchy.getAllInterfaces();
-            for (int i = 0; i < allInterfaces.length; i++) {
-                IType itype = allInterfaces[i];
-                if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
-                    seiCombo.add(itype.getFullyQualifiedName());
-                }
-            }
-        } catch (JavaModelException jme) {
-            CXFUIPlugin.log(jme.getStatus());
-        }
-
-        seiCombo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                String seiInterfaceName = seiCombo.getText();
-                model.setFullyQualifiedJavaInterfaceName(seiInterfaceName);
-            }
-        });
-
-        seiCombo.select(-1);
-        return seiCombo;
-    }
-
-    public static Button createExtractSEIButton(Composite parent) {
-        Button extractSEIButton = new Button(parent, SWT.RADIO);
-        extractSEIButton.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
-        return extractSEIButton;
-    }
-
-    public static Label createExtractSEILabel(Composite parent) {
-        Label extractSEILabel = new Label(parent, SWT.NONE);
-        extractSEILabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_LABEL);
-        return extractSEILabel;
-    }
-
-    public static Text createSEIInterfaceNameText(Composite parent) {
-        Text seiInterfaceNameText = new Text(parent, SWT.BORDER);
-        seiInterfaceNameText.setToolTipText(CXFUIMessages.JAVA2WS_EXTRACT_SEI_TOOLTIP);
-        return seiInterfaceNameText;
-    }
-
-    public static Label createMemebersToExtractLabel(Composite parent) {
-        Label seiMembersToExtractLabel = new Label(parent, SWT.NONE);
-        seiMembersToExtractLabel.setText(CXFUIMessages.JAVA2WS_EXTRACT_MEMBERS_LABEL);
-        return seiMembersToExtractLabel;
-    }
-
-    public static CheckboxTableViewer createSEIMembersToExtractTableViewer(Composite parent) {
-        CheckboxTableViewer seiMembersToExtractTableViewer = CheckboxTableViewer.newCheckList(parent,
-                SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-        seiMembersToExtractTableViewer.setLabelProvider(new JavaElementLabelProvider());
-        seiMembersToExtractTableViewer.setContentProvider(new ArrayContentProvider());
-        return seiMembersToExtractTableViewer;
-    }
-
-    public static Button createSelectAllButton(Composite parent) {
-        Button selectAllButton = new Button(parent, SWT.PUSH);
-        selectAllButton.setText(CXFUIMessages.JAVA2WS_SELECT_ALL_BUTTON);
-        return selectAllButton;
-    }
-
-    public static Button createDeselectAllButton(Composite parent) {
-        Button deselectAllButton = new Button(parent, SWT.PUSH);
-        deselectAllButton.setText(CXFUIMessages.JAVA2WS_DESELECT_ALL_BUTTON);
-        return deselectAllButton;
-    }
-    
-    public static Label createSelectImplementationLabel(Composite parent) {
-        Label selectImplementationLabel = new Label(parent, SWT.NONE);
-        selectImplementationLabel.setText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION);
-        return selectImplementationLabel;
-    }
-    
-    public static Combo createSelectImplementationCombo(Composite parent, 
-            final Java2WSDataModel model, IType javaStartingPointType) {
-        final Combo selectImplementationCombo = new Combo(parent, SWT.READ_ONLY);
-        selectImplementationCombo.setToolTipText(CXFUIMessages.JAVA2WS_SELECT_IMPLEMENTATION_TOOLTIP);
-
-        IJavaProject javaProject = JDTUtils.getJavaProject(model.getProjectName());
-        try {
-            ITypeHierarchy typeHierarchy = javaStartingPointType.newTypeHierarchy(javaProject, null);
-            IType[] allImplementations = typeHierarchy.getAllSubtypes(javaStartingPointType);
-            for (int i = 0; i < allImplementations.length; i++) {
-                IType itype = allImplementations[i];
-                if (!itype.isBinary() && itype.getResource().getProject().equals(javaProject.getProject())) {
-                    String packageName = itype.getPackageFragment().getElementName();
-                    if (packageName.trim().length() > 0) {
-                        packageName += "."; //$NON-NLS-1$
-                    }
-                    String qualifiedName = packageName + itype.getPrimaryElement().getElementName();
-                    selectImplementationCombo.add(qualifiedName);
-                }
-            }
-        } catch (JavaModelException jme) {
-            CXFUIPlugin.log(jme.getStatus());
-        }
-
-        selectImplementationCombo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                String implementationName = selectImplementationCombo.getText();
-                model.setFullyQualifiedJavaClassName(implementationName);
-            }
-        });
-
-        selectImplementationCombo.select(-1);
-        return selectImplementationCombo;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
deleted file mode 100644
index 2b7e9f8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/SpringConfigComposite.java
+++ /dev/null
@@ -1,92 +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.ui.widgets;
-
-import org.eclipse.jst.ws.internal.cxf.core.CXFCorePlugin;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.CXFPackage;
-import org.eclipse.jst.ws.internal.cxf.core.utils.CXFModelUtils;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author sclarke
- */
-public class SpringConfigComposite extends Composite {
-    private CXFContext context = CXFCorePlugin.getDefault().getJava2WSContext();
-
-    private Button useCXFServletButton;
-    private Button useSpringAppContextButton;
-    
-    public SpringConfigComposite(Composite parent, int style) {
-        super(parent, style);
-        addControls();
-    }
-
-    private void addControls() {
-        GridLayout preflayout = new GridLayout(1, true);
-        this.setLayout(preflayout);
-
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        this.setLayoutData(gridData);
-
-        Group springConfigGroup = new Group(this, SWT.SHADOW_IN);
-        springConfigGroup.setText(CXFUIMessages.SPRING_CONFIG_GROUP_LABEL);
-        GridLayout springConfigLayout = new GridLayout(2, true);
-        springConfigGroup.setLayout(springConfigLayout);
-        gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-        gridData.horizontalSpan = 2;
-        springConfigGroup.setLayoutData(gridData);
-
-        useCXFServletButton = new Button(springConfigGroup, SWT.RADIO);
-        useCXFServletButton.setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SERVLET);
-        useCXFServletButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setUseSpringApplicationContext(!selected);
-            }
-        });
-
-        useSpringAppContextButton = new Button(springConfigGroup, SWT.RADIO);
-        useSpringAppContextButton
-                .setText(CXFUIMessages.SPRING_CONFIG_USE_CXF_SPRING_APPLICATION_CONTEXT);
-        useSpringAppContextButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                boolean selected = ((Button) e.widget).getSelection();
-                context.setUseSpringApplicationContext(selected);
-            }
-        });
-
-        if (context.isUseSpringApplicationContext()) {
-            useSpringAppContextButton.setSelection(true);
-        } else {
-            useCXFServletButton.setSelection(true);
-        }
-    }
-    
-    public void setDefaults() {
-        boolean useSpringAppcontext = CXFModelUtils.getDefaultBooleanValue(CXFPackage.CXF_CONTEXT,
-                CXFPackage.CXF_CONTEXT__USE_SPRING_APPLICATION_CONTEXT);
-        useSpringAppContextButton.setSelection(useSpringAppcontext);
-        useCXFServletButton.setSelection(!useSpringAppcontext);
-    }
-    
-    public void storeValues() {
-        context.setUseSpringApplicationContext(useSpringAppContextButton.getSelection());
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java b/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
deleted file mode 100644
index 936485a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.ui/src/org/eclipse/jst/ws/internal/cxf/ui/widgets/WSDL2JavaWidgetFactory.java
+++ /dev/null
@@ -1,615 +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.ui.widgets;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaContext;
-import org.eclipse.jst.ws.internal.cxf.core.model.WSDL2JavaDataModel;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIMessages;
-import org.eclipse.jst.ws.internal.cxf.ui.CXFUIPlugin;
-import org.eclipse.jst.ws.internal.cxf.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.jst.ws.internal.cxf.ui.viewers.PackageNameColumnLabelProvider;
-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.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * Provides widgets for WSDL2Java preferences, wizards, dialogs. Enables the
- * reuse of widgets in multiple locations. Widgets have there labeling and
- * tooltips set here and where possible listeners are set which update instances
- * of <code>WSDL2JavaContext</code> and <code>WSDL2JavaDataModel</code>.
- * 
- * @author sclarke
- */
-public final class WSDL2JavaWidgetFactory {
-    private static final String XJC_DV_ARG = "-Xdv"; //$NON-NLS-1$
-    private static final String XJC_TS_ARG = "-Xts"; //$NON-NLS-1$
-    private static final String XJC_TS_MULTI_ARG = "-Xts:style:multiline"; //$NON-NLS-1$
-    private static final String XJC_TS_SIMPLE = "-Xts:style:simple"; //$NON-NLS-1$
-    private static final String XJC_LOCATOR_ARG = "-Xlocator"; //$NON-NLS-1$
-    private static final String XJC_SYNC_METHODS_ARG = "-Xsync-methods"; //$NON-NLS-1$
-    private static final String XJC_MARK_GENERATED_ARG = "-mark-generated"; //$NON-NLS-1$
-    private static final String XJC_EPISODE_FILE_ARG = "-episode"; //$NON-NLS-1$
-
-    private WSDL2JavaWidgetFactory() {
-    }
-
-    public static Button createGenerateClientButton(Composite parent, final WSDL2JavaContext model) {
-        final Button genClientButton = new Button(parent, SWT.CHECK);
-        genClientButton.setText(CXFUIMessages.JAVA2WS_GEN_CLIENT_LABEL);
-        genClientButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_CLIENT_TOOLTIP);
-        genClientButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setGenerateClient(genClientButton.getSelection());
-            }
-        });
-        genClientButton.setSelection(model.isGenerateClient());
-        return genClientButton;
-    }
-
-    public static Button createGenerateServerButton(Composite parent, final WSDL2JavaContext model) {
-        final Button genServerButton = new Button(parent, SWT.CHECK);
-        genServerButton.setText(CXFUIMessages.JAVA2WS_GEN_SERVER_LABEL);
-        genServerButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_SERVER_TOOLTIP);
-        genServerButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setGenerateServer(genServerButton.getSelection());
-            }
-        });
-        genServerButton.setSelection(model.isGenerateServer());
-        return genServerButton;
-    }
-
-    public static Button createGenerateImplementationButton(Composite parent, final WSDL2JavaContext model) {
-        final Button genImplementatinButton = new Button(parent, SWT.CHECK);
-        genImplementatinButton.setText(CXFUIMessages.JAVA2WS_GEN_IMPLEMENTATION_LABEL);
-        genImplementatinButton.setToolTipText(CXFUIMessages.WSDL2JAVA_GENERATE_IMPLEMENTATION_TOOLTIP);
-        genImplementatinButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setGenerateImplementation(genImplementatinButton.getSelection());
-            }
-        });
-        genImplementatinButton.setSelection(model.isGenerateImplementation());
-        return genImplementatinButton;
-    }
-
-    public static Button createProcessSOAPHeadersButton(Composite parent, final WSDL2JavaContext model) {
-        final Button processSOAPHeadersButton = new Button(parent, SWT.CHECK);
-        processSOAPHeadersButton.setText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS);
-        processSOAPHeadersButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PROCESS_SOAP_HEADERS_TOOLTIP);
-        processSOAPHeadersButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setProcessSOAPHeaders(processSOAPHeadersButton.getSelection());
-            }
-        });
-        processSOAPHeadersButton.setSelection(model.isProcessSOAPHeaders());
-        return processSOAPHeadersButton;
-    }
-
-    public static Button createNamespacePackageMappingButton(Composite parent, final WSDL2JavaContext model) {
-        final Button namespacePackageMappingButton = new Button(parent, SWT.CHECK);
-        namespacePackageMappingButton
-                .setText(CXFUIMessages.WSDL2JAVA_LOAD_DEFAULT_NAMESPACE_PACKAGE_MAPPING);
-        namespacePackageMappingButton
-                .setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_NAMESPACE_LOADING_TOOLTIP);
-        namespacePackageMappingButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setLoadDefaultNamespacePackageNameMapping(namespacePackageMappingButton.getSelection());
-            }
-        });
-        namespacePackageMappingButton.setSelection(model.isLoadDefaultNamespacePackageNameMapping());
-        return namespacePackageMappingButton;
-    }
-
-    public static Button createExcludesNamespaceMappingButton(Composite parent, final WSDL2JavaContext model) {
-        final Button excludesNamespaceMappingButton = new Button(parent, SWT.CHECK);
-        excludesNamespaceMappingButton
-                .setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_EXCLUDES_NAMESPACE_MAPPING);
-        excludesNamespaceMappingButton
-                .setToolTipText(CXFUIMessages.WSDL2JAVA_EXCLUDE_NAMESPACE_LOADING_TOOLTIP);
-        excludesNamespaceMappingButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setLoadDefaultExcludesNamepsaceMapping(excludesNamespaceMappingButton.getSelection());
-            }
-        });
-        excludesNamespaceMappingButton.setSelection(model.isLoadDefaultExcludesNamepsaceMapping());
-        return excludesNamespaceMappingButton;
-    }
-    
-    public static Button createNoAddressBindingButton(Composite parent, final WSDL2JavaContext model) {
-        final Button noAddressBindingButton = new Button(parent, SWT.CHECK);
-        noAddressBindingButton.setText(CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING,
-                model.getCxfRuntimeEdition()));
-        noAddressBindingButton.setToolTipText(
-                CXFUIMessages.bind(CXFUIMessages.WSDL2JAVA_NO_ADDRESS_BINDING_TOOLTIP, 
-                        model.getCxfRuntimeEdition()));
-        noAddressBindingButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setNoAddressBinding(noAddressBindingButton.getSelection());
-            }
-        });
-        noAddressBindingButton.setSelection(model.isNoAddressBinding());
-        return noAddressBindingButton;
-    }
-
-    public static Button createAutoNameResolutionButton(Composite parent, final WSDL2JavaContext model) {
-        final Button autoNameResolutionButton = new Button(parent, SWT.CHECK);
-        autoNameResolutionButton.setText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION);
-        autoNameResolutionButton.setToolTipText(CXFUIMessages.WSDL2JAVA_AUTO_NAME_RESOLUTION_TOOLTIP);
-        autoNameResolutionButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setAutoNameResolution(autoNameResolutionButton.getSelection());
-            }
-        });
-        autoNameResolutionButton.setSelection(model.isAutoNameResolution());
-        return autoNameResolutionButton;
-    }
-    
-    public static TableItem createXJCDefaultValuesTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcDefaultValuesItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcDefaultValuesItem.setText(0, XJC_DV_ARG);
-        xjcDefaultValuesItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_DEFAULT_VALUES);
-        xjcDefaultValuesItem.setChecked(model.isXjcUseDefaultValues());
-        return xjcDefaultValuesItem;
-    }
-
-    public static TableItem createXJCToStringTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcToStringItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcToStringItem.setText(0, XJC_TS_ARG);
-        xjcToStringItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING);
-        xjcToStringItem.setChecked(model.isXjcToString());
-        return xjcToStringItem;
-    }
-
-    public static TableItem createXJCToStringMultiLineTableItem(Table xjcArgsTable,
-            final WSDL2JavaContext model) {
-        TableItem xjcToStringMultiLineItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcToStringMultiLineItem.setText(0, XJC_TS_MULTI_ARG);
-        xjcToStringMultiLineItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_MULTILINE);
-        xjcToStringMultiLineItem.setChecked(model.isXjcToStringMultiLine());
-        return xjcToStringMultiLineItem;
-    }
-
-    public static TableItem createXJCToStringSimpleTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcToStringSimpleItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcToStringSimpleItem.setText(0, XJC_TS_SIMPLE);
-        xjcToStringSimpleItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_TOSTRING_SIMPLE);
-        xjcToStringSimpleItem.setChecked(model.isXjcToStringSimple());
-        return xjcToStringSimpleItem;
-    }
-
-    public static TableItem createXJCLocatorTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcLocatorItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcLocatorItem.setText(0, XJC_LOCATOR_ARG);
-        xjcLocatorItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_LOCATOR);
-        xjcLocatorItem.setChecked(model.isXjcLocator());
-        return xjcLocatorItem;
-    }
-
-    public static TableItem createXJCSyncMethodsTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcSyncMethodsItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcSyncMethodsItem.setText(0, XJC_SYNC_METHODS_ARG);
-        xjcSyncMethodsItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_SYNC_METHODS);
-        xjcSyncMethodsItem.setChecked(model.isXjcSyncMethods());
-        return xjcSyncMethodsItem;
-    }
-
-    public static TableItem createXJCMarkGeneratedTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcMarkGeneratedItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcMarkGeneratedItem.setText(0, XJC_MARK_GENERATED_ARG);
-        xjcMarkGeneratedItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_MARK_GENERATED);
-        xjcMarkGeneratedItem.setChecked(model.isXjcMarkGenerated());
-        return xjcMarkGeneratedItem;
-    }
-
-    public static TableItem createXJCEpisodeFileTableItem(Table xjcArgsTable, final WSDL2JavaContext model) {
-        TableItem xjcEpisodeFileItem = new TableItem(xjcArgsTable, SWT.NONE);
-        xjcEpisodeFileItem.setText(0, XJC_EPISODE_FILE_ARG);
-        xjcEpisodeFileItem.setText(1, CXFUIMessages.WSDL2JAVA_XJC_EPISODE_FILE);
-        return xjcEpisodeFileItem;
-    }
-
-    public static Table createXJCArgTable(Composite parent, final WSDL2JavaContext model) {
-        Table xjcArgsTable = new Table(parent, SWT.CHECK | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
-        xjcArgsTable.setToolTipText(CXFUIMessages.WSDL2JAVA_XJC_ARGS_TOOLTIP);
-        xjcArgsTable.setLinesVisible(true);
-        xjcArgsTable.setHeaderVisible(true);
-
-        TableLayout tableLayout = new TableLayout();
-        xjcArgsTable.setLayout(tableLayout);
-
-        TableColumn xjcArgColumn = new TableColumn(xjcArgsTable, SWT.NONE);
-        xjcArgColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_ARG_COLUMN_NAME);
-
-        ColumnWeightData columnWeightData = new ColumnWeightData(100, 100, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        TableColumn descriptionColumn = new TableColumn(xjcArgsTable, SWT.NONE);
-        descriptionColumn.setText(CXFUIMessages.WSDL2JAVA_XJC_DESCRIPTION_COLUMN_NAME);
-        columnWeightData = new ColumnWeightData(200, 200, true);
-        tableLayout.addColumnData(columnWeightData);
-
-        xjcArgsTable.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                if (event.detail == SWT.CHECK) {
-                    TableItem tableItem = (TableItem) event.item;
-                    String xjcArg = tableItem.getText(0);
-                    boolean checked = tableItem.getChecked();
-                    if (xjcArg.equals(XJC_DV_ARG)) {
-                        model.setXjcUseDefaultValues(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_TS_ARG)) {
-                        model.setXjcToString(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_TS_MULTI_ARG)) {
-                        model.setXjcToStringMultiLine(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_TS_SIMPLE)) {
-                        model.setXjcToStringSimple(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_LOCATOR_ARG)) {
-                        model.setXjcLocator(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_SYNC_METHODS_ARG)) {
-                        model.setXjcSyncMethods(checked);
-                    }
-
-                    if (xjcArg.equals(XJC_MARK_GENERATED_ARG)) {
-                        model.setXjcMarkGenerated(checked);
-                    }
-                }
-            }
-
-        });
-
-        xjcArgColumn.pack();
-        descriptionColumn.pack();
-
-        return xjcArgsTable;
-    }
-
-    public static Label createFrontendLabel(Composite parent) {
-        Label frontendLabel = new Label(parent, SWT.NONE);
-        frontendLabel.setText(CXFUIMessages.CXF_DEFAULT_FRONTEND_LABEL);
-        return frontendLabel;
-    }
-
-    public static Combo createFrontendCombo(Composite parent, final WSDL2JavaContext model) {
-        final Combo frontendCombo = new Combo(parent, SWT.READ_ONLY);
-        frontendCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_FRONTEND_TOOLTIP);
-        frontendCombo.add(model.getFrontend().getLiteral());
-        frontendCombo.setEnabled(false);
-        frontendCombo.select(0);
-        return frontendCombo;
-    }
-
-    public static Label createDatabindingLabel(Composite parent) {
-        Label databindingLabel = new Label(parent, SWT.NONE);
-        databindingLabel.setText(CXFUIMessages.CXF_DEFAULT_DATABINDING_LABEL);
-        return databindingLabel;
-    }
-
-    public static Combo createDatabindingCombo(Composite parent, final WSDL2JavaContext model) {
-        final Combo databindingCombo = new Combo(parent, SWT.READ_ONLY);
-        databindingCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_DATABINDING_TOOLTIP);
-        databindingCombo.add(model.getDatabinding().getLiteral());
-        databindingCombo.setEnabled(false);
-        databindingCombo.select(0);
-        return databindingCombo;
-    }
-
-    public static Label createWSDLVersionLabel(Composite parent) {
-        Label wsdlVersionLabel = new Label(parent, SWT.NONE);
-        wsdlVersionLabel.setText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_LABEL);
-        return wsdlVersionLabel;
-    }
-
-    public static Combo createWSDLVersionCombo(Composite parent, final WSDL2JavaContext model) {
-        final Combo wsdlVersionCombo = new Combo(parent, SWT.READ_ONLY);
-        wsdlVersionCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_WSDL_VERSION_TOOLTIP);
-        wsdlVersionCombo.add(model.getWsdlVersion());
-        wsdlVersionCombo.setEnabled(false);
-        wsdlVersionCombo.select(0);
-        return wsdlVersionCombo;
-    }
-
-    public static Button createDefaultValuesButton(Composite parent, final WSDL2JavaContext model) {
-        final Button useDefaultValuesButton = new Button(parent, SWT.CHECK);
-        useDefaultValuesButton.setText(CXFUIMessages.WSDL2JAVA_USE_DEFAULT_VALUES);
-        useDefaultValuesButton.setToolTipText(CXFUIMessages.WSDL2JAVA_DEFAULT_VALUES_TOOLTIP);
-        useDefaultValuesButton.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                model.setUseDefaultValues(useDefaultValuesButton.getSelection());
-            }
-        });
-        useDefaultValuesButton.setSelection(model.isUseDefaultValues());
-        return useDefaultValuesButton;
-    }
-
-    public static Label createOutputDirectoryLabel(Composite parent) {
-        Label srcDirLabel = new Label(parent, SWT.NONE);
-        srcDirLabel.setText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY);
-        srcDirLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
-        return srcDirLabel;
-    }
-
-    public static Combo createOutputDirectoryCombo(Composite parent, final WSDL2JavaDataModel model) {
-        final Combo outputDirCombo = new Combo(parent, SWT.READ_ONLY);
-        outputDirCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_OUTPUT_DIRECTORY_TOOLTIP);
-        outputDirCombo.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                String javaSourceFolder = outputDirCombo.getText();
-                model.setJavaSourceFolder(javaSourceFolder);
-            }
-        });
-
-        populateOutputDirectoryCombo(outputDirCombo, model.getProjectName());
-        
-        return outputDirCombo;
-    }
-
-    public static void populateOutputDirectoryCombo(Combo outputDirCombo, String projectName) {
-        outputDirCombo.removeAll();
-        try {
-            IPackageFragmentRoot[] packageFragmentRoots = JDTUtils.getJavaProject(projectName)
-                    .getAllPackageFragmentRoots();
-            for (int i = 0; i < packageFragmentRoots.length; i++) {
-                IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[i];
-                if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
-                    outputDirCombo.add(packageFragmentRoot.getResource().getFullPath().toOSString());
-                }
-            }
-            outputDirCombo.select(0);
-        } catch (JavaModelException jme) {
-            CXFUIPlugin.log(jme.getStatus());
-        }
-    }
-    
-    public static Label createPackageNameLabel(Composite parent) {
-        Label packageNameLabel = new Label(parent, SWT.NONE);
-        packageNameLabel.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME);
-        packageNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
-        return packageNameLabel;
-    }
-
-    public static Text createPackageNameText(Composite parent, final WSDL2JavaDataModel model) {
-        final Text packageNameText = new Text(parent, SWT.BORDER);
-        packageNameText.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_TOOLTIP);
-
-        packageNameText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                String packageName = packageNameText.getText();
-                model.getIncludedNamespaces().put(model.getTargetNamespace(), packageName);
-            }
-        });
-
-        packageNameText.setText(model.getIncludedNamespaces().get(model.getTargetNamespace()));
-
-        return packageNameText;
-    }
-
-    public static Button createNamespacePackageMappingButton(Composite parent) {
-        final Button namespaceMappingButton = new Button(parent, SWT.CHECK);
-        namespaceMappingButton.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL);
-        namespaceMappingButton.setToolTipText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_OPTIONAL_TOOLTIP);
-        return namespaceMappingButton;
-    }
-
-    public static TableViewerColumn createWSDLNamespaceViewerColumn(TableViewer tableViewer) {
-        TableViewerColumn wsdlNamespaceViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
-        wsdlNamespaceViewerColumn.setLabelProvider(new ColumnLabelProvider() {
-
-            @Override
-            public String getText(Object element) {
-                return element.toString();
-            }
-        });
-        TableColumn wsdlNamespaceColumn = wsdlNamespaceViewerColumn.getColumn();
-        wsdlNamespaceColumn.setText(CXFUIMessages.WSDL2JAVA_WSDL_NAMESPACE_COLUMN_HEADER);
-        wsdlNamespaceColumn.pack();
-        return wsdlNamespaceViewerColumn;
-    }
-
-    public static TableViewerColumn createPackageNameColumn(TableViewer tableViewer, WSDL2JavaDataModel model) {
-        TableViewerColumn packageNameViewerColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
-        packageNameViewerColumn.setLabelProvider(new PackageNameColumnLabelProvider(model));
-
-        TableColumn packageNameColumn = packageNameViewerColumn.getColumn();
-        packageNameColumn.setText(CXFUIMessages.WSDL2JAVA_PACKAGE_NAME_COLUMN_HEADER);
-        packageNameColumn.pack();
-        return packageNameViewerColumn;
-    }
-
-    public static Label createServiceNameLabel(Composite parent) {
-        Label serviceNameLabel = new Label(parent, SWT.NONE);
-        serviceNameLabel.setText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME);
-        serviceNameLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
-        return serviceNameLabel;
-    }
-
-    public static Combo createServiceNameCombo(Composite parent, final WSDL2JavaDataModel model) {
-        final Combo serviceNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
-        serviceNameCombo.setToolTipText(CXFUIMessages.WSDL2JAVA_SERVICE_NAME_TOOLTIP);
-
-        serviceNameCombo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                model.setServiceName(serviceNameCombo.getText());
-            }
-        });
-
-        populateServiceNameCombo(serviceNameCombo, model);
-
-        return serviceNameCombo;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public static void populateServiceNameCombo(Combo serviceNameCombo, WSDL2JavaDataModel model) {
-        serviceNameCombo.removeAll();
-        Definition definition = model.getWsdlDefinition();
-        if (definition != null) {
-            Map servicesMap = definition.getServices();
-            if (servicesMap != null) {
-                Set servicesEntrySet = servicesMap.entrySet();
-                Iterator servicesIterator = servicesEntrySet.iterator();
-                while (servicesIterator.hasNext()) {
-                    Map.Entry serviceEntry = (Map.Entry) servicesIterator.next();
-                    Service service = (Service) serviceEntry.getValue();
-                    QName qName = service.getQName();
-                    serviceNameCombo.add(qName.getLocalPart());
-                }
-                serviceNameCombo.select(-1);
-            }
-        }
-    }
-
-    public static Label createBindingFilesLabel(Composite parent) {
-        Label bindingFilesLabel = new Label(parent, SWT.NONE);
-        bindingFilesLabel.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES);
-        bindingFilesLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
-        return bindingFilesLabel;
-    }
-
-    public static List createBindingFilesList(Composite parent) {
-        final List bindingFilesList = new List(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-        bindingFilesList.setToolTipText(CXFUIMessages.WSDL2JAVA_BINDING_NAME_TOOLTIP);
-        return bindingFilesList;
-    }
-
-    public static Button createAddBindingFileButton(final Composite parent, final WSDL2JavaDataModel model,
-            final List bindingFilesList) {
-        Button addBindingFileButton = new Button(parent, SWT.PUSH);
-        addBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_ADD);
-        addBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                ResourceSelectionDialog selectionDialog = new ResourceSelectionDialog(
-                        parent.getShell(),
-                        "xml", //$NON-NLS-1$ 
-                        CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_FILTER_NAME,
-                        CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_TITLE);
-                selectionDialog.setMessage(CXFUIMessages.WSDL2JAVA_BINDING_FILE_DIALOG_MESSAGE);
-                if (selectionDialog.open() == SelectionDialog.OK) {
-                    String result = selectionDialog.getResult()[0].toString();
-                    if (!model.getBindingFiles().contains(result)) {
-                        model.getBindingFiles().add(result);
-                        bindingFilesList.add(result);
-                    }
-                }
-            }
-        });
-        return addBindingFileButton;
-    }
-
-    public static Button createRemoveBindingFileButton(Composite parent, final WSDL2JavaDataModel model,
-            final List bindingFilesList) {
-        final Button removeBindingFileButton = new Button(parent, SWT.PUSH);
-        removeBindingFileButton.setText(CXFUIMessages.WSDL2JAVA_BINDING_FILES_REMOVE);
-        removeBindingFileButton.setEnabled(false);
-        removeBindingFileButton.addSelectionListener(new SelectionAdapter() {
-
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                String[] selectedBindingFiles = bindingFilesList.getSelection();
-                for (String bindingFile : selectedBindingFiles) {
-                    bindingFilesList.remove(bindingFile);
-                    model.getBindingFiles().remove(bindingFile);
-                }
-
-                if (bindingFilesList.getItemCount() == 0) {
-                    removeBindingFileButton.setEnabled(false);
-                }
-            }
-        });
-
-        bindingFilesList.addPaintListener(new PaintListener() {
-            public void paintControl(PaintEvent event) {
-                if (bindingFilesList.getItemCount() == 0) {
-                    removeBindingFileButton.setEnabled(false);
-                } else {
-                    removeBindingFileButton.setEnabled(true);
-                }
-            }
-        });
-
-        return removeBindingFileButton;
-    }
-
-    public static Label createPaddingLabel(Composite parent) {
-        return new Label(parent, SWT.NONE);
-    }
-
-    public static Label createXMLCatalogLabel(Composite parent) {
-        Label xmlCatalogLabel = new Label(parent, SWT.NONE);
-        xmlCatalogLabel.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG);
-        xmlCatalogLabel.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
-        return xmlCatalogLabel;
-    }
-
-    public static Text createXMLCatalogText(Composite parent, final WSDL2JavaDataModel model) {
-        final Text xmlCatalogText = new Text(parent, SWT.BORDER);
-        xmlCatalogText.setToolTipText(CXFUIMessages.WSDL2JAVA_XML_CATALOG_TOOLTIP);
-        xmlCatalogText.addModifyListener(new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                String xmlCatalog = xmlCatalogText.getText();
-                model.setCatalogFile(xmlCatalog);
-            }
-        });
-
-        return xmlCatalogText;
-    }
-
-    public static Button createXMLCatalogBrowseButton(Composite parent) {
-        Button xmlCatalogBrowseButton = new Button(parent, SWT.PUSH);
-        xmlCatalogBrowseButton.setText(CXFUIMessages.WSDL2JAVA_XML_CATLOG_BROWSE);
-        return xmlCatalogBrowseButton;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/.classpath b/bundles/org.eclipse.jst.ws.jaxws.core/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/.project b/bundles/org.eclipse.jst.ws.jaxws.core/.project
deleted file mode 100644
index 379770e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws.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.jaxws.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 83e002a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Feb 02 11:50:42 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.jaxws.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
deleted file mode 100644
index e0dc727..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.core;singleton:=true
-Bundle-Vendor: %pluginProvider
-Bundle-Version: 0.5.2.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Eclipse-RegisterBuddy: org.eclipse.jst.ws.annotations.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;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.jst.ws.annotations.core;bundle-version="0.5.0",
- javax.wsdl;bundle-version="[1.6.2,1.7.0)",
- org.eclipse.jst.ws;bundle-version="[1.0.304,1.1.0)"
-Export-Package: org.eclipse.jst.ws.internal.jaxws.core;x-friends:="org.eclipse.jst.ws.jaxws.core.tests",
- org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization;x-friends:="org.eclipse.jst.ws.annotations.core",
- org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;x-friends:="org.eclipse.jst.ws.annotations.core",
- org.eclipse.jst.ws.jaxws.core.utils
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0",
- javax.xml.ws.handler;version="2.1.0",
- javax.xml.ws.handler.soap;version="2.1.0",
- javax.xml.ws.http;version="2.1.0",
- javax.xml.ws.soap;version="2.1.0",
- javax.xml.ws.spi;version="2.1.0",
- javax.xml.ws.wsaddressing;version="2.1.0"
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/about.html b/bundles/org.eclipse.jst.ws.jaxws.core/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/about.ini b/bundles/org.eclipse.jst.ws.jaxws.core/about.ini
deleted file mode 100644
index e3b93e6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/about.mappings b/bundles/org.eclipse.jst.ws.jaxws.core/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.core/about.properties b/bundles/org.eclipse.jst.ws.jaxws.core/about.properties
deleted file mode 100644
index f4c1f7d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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=JAX-WS Tools (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Shane Clarke and others 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/build.properties b/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
deleted file mode 100644
index 8b9d613..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               about.properties,\
-               about.ini,\
-               about.mappings,\
-               icons/
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
deleted file mode 100644
index cdfc3ae..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.properties
+++ /dev/null
@@ -1,33 +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 JAXWS Core
-pluginName=JAX-WS Tools Core (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-WEBSERVICE_CLASS_DEFAULT_PUBLIC_CONSTRUCTOR_RULE=Classes annotated with @WebService must have a default public constructor
-WEBSERVICE_CLASS_PUBLIC_ABSTRACT_FINAL_RULE=Classes annotated with @WebService must be an outer public class, must not be final, and must not be abstract
-WEBSERVICE_CLASS_NO_FINALIZE_METHOD_RULE=Classes annotated with @WebService must not define a finalize() method
-WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_ANNNOTATION=@WebMethod annotations only supported in classes with the @WebService annotation
-WEBSERVICE_SEI_NO_WEBMETHOS_RULE=No @WebMethod annotations allowed in an implementation class that contains an endpointInterface attribute in it's @WebService annotation
-WEBSERVICE_ON_SEI_ATTRIBUTES_RULE=Certain @WebService annotation attributes are restricted when used on SEI's
-WEBSERVICE_WEBSERVICE_PROVIDER_COEXIST_RULE=@WebService and @WebServiceProvider annotations cannot coexist
-ONEWAY_NO_RETURN_VALUE=@Oneway methods must not return a value
-WEBMETHOD_ONLY_PUBLIC_METHODS=Methods annotated with @WebMethod must be public, and must not be declared static or final
-SOAPBINDING_METHOD_STYLE_DOCUMENT_RULE=@SOAPBinding annotation may be placed on a method if and only if the SOAPBinding.style is DOCUMENT
-WEBMETHOD_EXCLUDE_SPECIFIED_RULE=@WebMethod exclude attribute is not allowed in SEI's. If specified in an implementation class, then other attributes in the @WebMethod annotation are not allowed
-SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED_RULE=A method that has a SOAPBinding.use of ENCODED cannot have a SOAPBinding.parameterStyle present
-SOAPBINDING_DOCUMENT_BARE_RULES=Document Bare operations are subject to a number of restrictions. Combinations of @Oneway. Not @Oneway. Void Return. Non-Void Return. @WebParam Modes IN, OUT, INOUT. Header parameters
-HOLDER_TYPES_PARAMETERS_RULE=Parameters that conform to the definition of Holder Types must be annotated with @WebParam.Mode.OUT or @WebParam.Mode.INOUT
-UNIQUE_NAMES_RULE=Checks @ResponseWrapper, @RequestWrapper and @WebFault Beans for unique className and faultBean attributes
-HANDLERCHAIN_RULES=@HandlerChain and @SOAPMessageHandlers annotations cannot coexist. @HandlerChain allowed on TYPE only
-WEBSERVICEREFS_RULES=Each @WebServiceRef annotation inside a @WebServiceRefs must contain name and type elements with non-default values
-JAXWS_CATEGORY_NAME=JAX-WS
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
deleted file mode 100644
index ebcef7b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/plugin.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension point="org.eclipse.jst.ws.annotations.core.annotationCategory">
-      <category
-            id="jaxws.category"
-            name="%JAXWS_CATEGORY_NAME">
-      </category>
-   </extension>
-
-   <extension point="org.eclipse.jst.ws.annotations.core.annotationDefinition">
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.WebService"
-            name="WebService">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.WebMethod"
-            name="WebMethod">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.WebParam"
-            name="WebParam">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.WebResult"
-            name="WebResult">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.HandlerChain"
-            name="HandlerChain">
-         <targetFilter target="FIELD"/>
-         <targetFilter target="METHOD"/>
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.Oneway"
-            name="Oneway">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.jws.soap.SOAPBinding"
-            name="SOAPBinding">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebServiceProvider"
-            name="WebServiceProvider"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebServiceClient"
-            name="WebServiceClient"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebServiceRef"
-            name="WebServiceRef"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebServiceRefs"
-            name="WebServiceRefs"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.ServiceMode"
-            name="ServiceMode"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebFault"
-            name="WebFault"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.BindingType"
-            name="BindingType"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.RequestWrapper"
-            name="RequestWrapper">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.ResponseWrapper"
-            name="ResponseWrapper">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.WebEndpoint"
-            name="WebEndpoint"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.RespectBinding"
-            name="RespectBinding"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.soap.Addressing"
-            name="Addressing"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.soap.MTOM"
-            name="MTOM"
-            restrictedTo="CLASS_ONLY">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.FaultAction"
-            name="FaultAction">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.Action"
-            name="Action">
-      </annotation>
-      <annotation
-            category="jaxws.category"
-            class="javax.xml.ws.spi.WebServiceFeatureAnnotation"
-            name="WebServiceFeatureAnnotation">
-      </annotation>
-   </extension>
-   
-   <extension point="org.eclipse.jst.ws.annotations.core.annotationInitializer">
-      <initializer
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebServiceAttributeInitializer">
-      </initializer>
-      <initializer
-            annotation="javax.jws.WebMethod"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebMethodAttributeInitializer">
-      </initializer>
-      <initializer
-            annotation="javax.jws.WebParam"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebParamAttributeInitializer">
-      </initializer>
-      <initializer
-            annotation="javax.jws.WebResult"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.WebResultAttributeInitializer">
-      </initializer>
-      <initializer
-            annotation="javax.jws.soap.SOAPBinding"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.SOAPBindingAttributeInitializer">
-      </initializer>      
-      <initializer
-            annotation="javax.xml.ws.RequestWrapper"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.RequestWrapperAttributeInitializer">
-      </initializer>
-      <initializer
-            annotation="javax.xml.ws.ResponseWrapper"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.initialization.ResponseWrapperAttributeInitializer">
-      </initializer>
-   </extension>
-   
-   <extension point="org.eclipse.jst.ws.annotations.core.annotationProcessor">
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.HolderTypeParametersRule">
-         <description>
-            %HOLDER_TYPES_PARAMETERS_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.UniqueNamesRule">
-         <description>
-            %UNIQUE_NAMES_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceDefaultPublicConstructorRule">
-         <description>
-            %WEBSERVICE_CLASS_DEFAULT_PUBLIC_CONSTRUCTOR_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServicePublicAbstractFinalRule">
-         <description>
-            %WEBSERVICE_CLASS_PUBLIC_ABSTRACT_FINAL_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceNoFinalizeMethodRule">
-         <description>
-            %WEBSERVICE_CLASS_NO_FINALIZE_METHOD_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIRestrictionsRule">
-         <description>
-            %WEBSERVICE_SEI_NO_WEBMETHOS_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceSEIAllowedAttributesRule">
-         <description>
-            %WEBSERVICE_ON_SEI_ATTRIBUTES_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebService"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceWebServiceProviderCoExistRule">
-         <description>
-         	%WEBSERVICE_WEBSERVICE_PROVIDER_COEXIST_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebMethod"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodCheckForWebServiceRule">
-         <description>
-            %WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE_ANNNOTATION
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebMethod"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodPublicStaticFinalRule">
-         <description>
-            %WEBMETHOD_ONLY_PUBLIC_METHODS
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.WebMethod"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebMethodExcludeRules">
-         <description>
-            %WEBMETHOD_EXCLUDE_SPECIFIED_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.Oneway"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.OnewayRules">
-         <description>
-            %ONEWAY_NO_RETURN_VALUE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.soap.SOAPBinding"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingMethodStyleDocumentRule">
-         <description>
-            %SOAPBINDING_METHOD_STYLE_DOCUMENT_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.soap.SOAPBinding"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingMethodUseRule">
-         <description>
-            %SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED_RULE
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.soap.SOAPBinding"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.SOAPBindingDocumentBareRules">
-         <description>
-            %SOAPBINDING_DOCUMENT_BARE_RULES
-         </description>
-      </processor>
-      <processor
-            annotation="javax.jws.HandlerChain"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.HandlerChainRules">
-         <description>
-            %HANDLERCHAIN_RULES
-         </description>
-      </processor>     
-      <processor
-            annotation="javax.xml.ws.WebServiceRefs"
-            class="org.eclipse.jst.ws.internal.jaxws.core.annotations.validation.WebServiceRefsRules">
-         <description>
-            %WEBSERVICEREFS_RULES
-         </description>
-      </processor>     
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
deleted file mode 100644
index ac01369..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.jaxws.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class JAXWSCoreMessages extends NLS {
-    private static final String BUNDLE_NAME = 
-        "org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages"; //$NON-NLS-1$
-
-    public static String TYPE_NAME_DIFFERENT_CASE_EXISTS;
-    public static String TYPE_WITH_NAME_ALREADY_EXISTS;
-    
-    public static String ONEWAY_NO_RETURN_VALUE;
-    public static String ONEWAY_NO_CHECKED_EXCEPTIONS;
-    public static String ONEWAY_NO_HOLDER_PARAMETERS;
-    public static String WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE;
-    
-    public static String HOLDER_TYPE_MUST_BE_OUT_INOUT;
-    
-    public static String DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER;
-    public static String DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER;
-    public static String DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER;
-    public static String DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER;
-
-    public static String HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS;
-    public static String HANDLER_CHAIN_ON_FIELD;
-    public static String HANDLER_CHAIN_ON_METHOD;
-
-    public static String WEBSERVICEREFS_NAME_REQUIRED;
-    public static String WEBSERVICEREFS_TYPE_REQUIRED;
-
-    public static String WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT;
-    
-    public static String WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE;
-    public static String WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
-    public static String WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED;
-    public static String WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED;
-    public static String WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED;
-    public static String WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI;
-
-    public static String WEBSERVICE_PUBLIC_ABSTRACT_FINAL;
-    public static String WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR;
-    public static String WEBSERVICE_OVERRIDE_FINALIZE;
-    public static String WEBSERVICE_ENDPOINTINTERFACE_SEI;
-    public static String WEBSERVICE_PORTNAME_SEI;
-    public static String WEBSERVICE_SERVICENAME_SEI;
-
-    public static String WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM;
-    public static String WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY;
-
-    public static String WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION;
-    
-    public static String SOAPBINDING_ON_METHOD_STYLE_DOCUMENT_ONLY;
-    public static String SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED;
-    
-    public static String OPERATION_NAMES_MUST_BE_UNIQUE_ERROR;
-    public static String WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE;
-    public static String DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS;
-    
-    static {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, JAXWSCoreMessages.class);
-    }
-
-    private JAXWSCoreMessages() {
-    }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
deleted file mode 100644
index 58f5212..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCoreMessages.properties
+++ /dev/null
@@ -1,60 +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
-TYPE_NAME_DIFFERENT_CASE_EXISTS=A Type with the same name but different case already exists
-TYPE_WITH_NAME_ALREADY_EXISTS=A compilation unit named ''{0}'' already exists in package ''{1}''
-
-WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR=Classes annotated with @WebService must have a default public constructor
-WEBSERVICE_PUBLIC_ABSTRACT_FINAL=Classes annotated with @WebService must be an outer public class, must not be final, and must not be abstract
-WEBSERVICE_OVERRIDE_FINALIZE=Classes annotated with @WebService must not define a finalize() method
-WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE=@WebMethod is only supported on classes annotated with @WebService
-WEBMETHOD_ONLY_ON_PUBLIC_METHODS=@WebMethod annotation is not allowed on non-public methods
-WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED=@WebMethod annotation is not allowed on final methods
-WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED=@WebMethod annotation is not allowed on static methods
-WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED=@WebMethod exclude attribute is specified. No other attributes allowed
-WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI=@WebMethod annotations in SEI's are not allowed to specify the exclude attribute
-WEBSERVICE_SERVICENAME_SEI=@WebService serviceName element is not allowed on SEI
-WEBSERVICE_ENDPOINTINTERFACE_SEI=@WebService endpointInterface element is not allowed on SEI
-WEBSERVICE_PORTNAME_SEI=@WebService portName element is not allowed on SEI
-WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT=Implementation class must implement the SEI method {0}
-WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE=The endpointInterface ''{0}'' must be an Interface
-WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND=The endpointInterface ''{0}'' cannot be found
-WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED=The endpointInterface ''{0}'' must be annotated with @javax.jws.WebService
-WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC=The endpointInterface ''{0}'' must be public
-WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER=The endpointInterface ''{0}'' must be an outer interface
-WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE=@WebService annotation contains an endpointInterface attribute. No name attribute allowed
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS=@WebService annotation contains an endpointInterface attribute. No methods annotated with @WebMethod allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING=@WebService annotation contains an endpointInterface attribute. @SOAPBinding not allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT=@WebService annotation contains an endpointInterface attribute. No methods annotated with @WebResult allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM=@WebService annotation contains an endpointInterface attribute. No parameters annotated with @WebParam allowed in implementation class
-WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY=@WebService annotation contains an endpointInterface attribute. No methods annotated with @Oneway allowed in implementation class
-WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION=@WebService and @WebServiceProvider annotations cannot be combined
-ONEWAY_NO_RETURN_VALUE=@Oneway methods must not return a value
-ONEWAY_NO_CHECKED_EXCEPTIONS=@Oneway methods must not declare any checked exceptions
-ONEWAY_NO_HOLDER_PARAMETERS=@Oneway methods must not accept any javax.xml.ws.Holder<T> parameters. 
-WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE=The @WebParam.Mode.OUT and @WebParam.Mode.INOUT modes may only be specified for javax.xml.ws.Holder<T> parameters
-HOLDER_TYPE_MUST_BE_OUT_INOUT=javax.xml.ws.Holder<T> parameters must be @WebParam.Mode.OUT or @WebParam.Mode.INOUT
-SOAPBINDING_ON_METHOD_STYLE_DOCUMENT_ONLY=The @SOAPBinding annotation may be placed on a method if and only if the SOAPBinding.style is DOCUMENT
-SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED=A method that has a SOAPBinding.use of ENCODED cannot have a SOAPBinding.parameterStyle present
-DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER=Document literal bare methods may have only one non-header IN parameter
-DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER=Document literal bare methods that declare a non-void return value may not have any OUT or INOUT parameters
-DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER=Document literal bare methods that declare a void return value may have only one IN/INOUT parameter
-DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER=Document literal bare methods that declare a void return value may have only one OUT/INOUT parameter
-WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT=The @WebParam name attribute is required when the operation is Document Bare and the mode is OUT or INOUT
-OPERATION_NAMES_MUST_BE_UNIQUE_ERROR=Operation names must be unique : {0}
-WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE=Generated Request/Response and Fault bean classes must have unique names within a package and must not clash with other classes in that package : {0}
-DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS=Document Literal Bare operations must have unique @WebParam.name and @WebResult.name attributes across all operations on the Web Service : {0}
-HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS=@HandlerChain and @SOAPMessageHandlers cannot be combined
-HANDLER_CHAIN_ON_FIELD=The @HandlerChain annotation may only be specified on a TYPE. The annotation target includes FIELD for use by JAX-WS 2.0
-HANDLER_CHAIN_ON_METHOD=The @HandlerChain annotation may only be specified on a TYPE. The annotation target includes METHOD for use by JAX-WS 2.0
-WEBSERVICEREFS_NAME_REQUIRED=Each @WebServiceRef annotation inside a @WebServiceRefs must contain a name element with a non-default ("") value
-WEBSERVICEREFS_TYPE_REQUIRED=Each @WebServiceRef annotation inside a @WebServiceRefs must contain a type element with a non-default (Object.class) value
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java
deleted file mode 100644
index d42e1d2..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/JAXWSCorePlugin.java
+++ /dev/null
@@ -1,55 +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.jaxws.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class JAXWSCorePlugin extends Plugin {
-    public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.core"; //$NON-NLS-1$
-    
-    // The shared instance
-    private static JAXWSCorePlugin plugin;
-    
-    public static JAXWSCorePlugin 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) {
-        JAXWSCorePlugin.log(new Status(severity, JAXWSCorePlugin.PLUGIN_ID, message));
-    }
-
-    public static void log(IStatus status) {
-        JAXWSCorePlugin.getDefault().getLog().log(status);
-    }
-
-    public static void log(Throwable exception) {
-        JAXWSCorePlugin.log(new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID, exception
-                .getLocalizedMessage(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java
deleted file mode 100644
index 3bed80f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/RequestWrapperAttributeInitializer.java
+++ /dev/null
@@ -1,152 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.DOT_CHARACTER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.JAXWS_SUBPACKAGE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.LOCAL_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class RequestWrapperAttributeInitializer extends AnnotationAttributeInitializer {
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            IType type = method.getCompilationUnit().findPrimaryType();
-
-            MemberValuePair classNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, CLASS_NAME,
-                    getClassName(type, method));
-
-            MemberValuePair localNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, LOCAL_NAME,
-                    getLocalName(type, method));
-
-            MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                    TARGET_NAMESPACE, getTargetNamespace(type));
-
-            memberValuePairs.add(classNameValuePair);
-            memberValuePairs.add(localNameValuePair);
-            memberValuePairs.add(targetNamespaceValuePair);
-        }
-        return memberValuePairs;
-    }
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-        
-        List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            IType type = method.getCompilationUnit().findPrimaryType();
-
-            String memberValuePairName = memberValuePair.getName().getIdentifier();
-
-            if (memberValuePairName.equals(CLASS_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getClassName(type, method),
-                        memberValuePair.getValue()));
-            }
-            if (memberValuePairName.equals(LOCAL_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getLocalName(type, method),
-                        memberValuePair.getValue()));
-            }
-            if (memberValuePairName.equals(TARGET_NAMESPACE)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(type),
-                        memberValuePair.getValue()));
-            }
-        }
-        return completionProposals;
-    }
-    
-    protected String getPackageName(IType type) {
-        StringBuilder packageName = new StringBuilder(type.getPackageFragment().getElementName());
-        if (packageName.length() > 0) {
-            packageName.append(DOT_CHARACTER);               
-        }
-        packageName.append(JAXWS_SUBPACKAGE);
-        packageName.append(DOT_CHARACTER);
-        return packageName.toString();
-    }
-    
-    protected String getClassName(IType type, IMethod method) {
-        try {
-            String methodName = method.getElementName();
-            return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
-                + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-    
-    protected String getLocalName(IType type, IMethod method) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(method, WebMethod.class);
-            if (annotation != null) {
-                String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
-                if (operationName != null) {
-                    return operationName;
-                }
-            }
-            return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-    
-    protected String getTargetNamespace(IType type) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(type, WebService.class);
-            if (annotation != null) {
-                String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
-                if (targetNamespace != null && targetNamespace.length() > 0) {
-                    return targetNamespace;
-                }
-            }
-            return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.java
deleted file mode 100644
index 4198161..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/ResponseWrapperAttributeInitializer.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.internal.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE_SUFFIX;
-
-import java.util.Locale;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class ResponseWrapperAttributeInitializer extends RequestWrapperAttributeInitializer {
-
-    @Override
-    protected String getClassName(IType type, IMethod method) {
-        try {
-            String methodName = method.getElementName() + RESPONSE_SUFFIX;
-            return getPackageName(type) + methodName.substring(0, 1).toUpperCase()
-                + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-    
-    @Override
-    protected String getLocalName(IType type, IMethod method) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(method, WebMethod.class);
-            if (annotation != null) {
-                String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
-                if (operationName != null) {
-                    return operationName + RESPONSE_SUFFIX;
-                }
-            }
-            return method.getElementName() + RESPONSE_SUFFIX 
-                    + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-    
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java
deleted file mode 100644
index 4eaea77..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/SOAPBindingAttributeInitializer.java
+++ /dev/null
@@ -1,58 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.USE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-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;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class SOAPBindingAttributeInitializer extends AnnotationAttributeInitializer {
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), STYLE, Style.DOCUMENT);
-
-        MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), USE, Use.LITERAL);
-
-        MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), PARAMETER_STYLE, ParameterStyle.WRAPPED);
-        
-        memberValuePairs.add(styleValuePair);
-        memberValuePairs.add(useValuePair);
-        memberValuePairs.add(parameterStyleValuePair);
-        return memberValuePairs;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java
deleted file mode 100644
index 0986b96..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebMethodAttributeInitializer.java
+++ /dev/null
@@ -1,107 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ACTION;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodAttributeInitializer extends AnnotationAttributeInitializer {
-    
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            IType type = method.getCompilationUnit().findPrimaryType();
-            
-            MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                    OPERATION_NAME, getOperationNameValue(type, method));
-
-            MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                    ACTION, getActionValue(type, method));
-
-            memberValuePairs.add(operationValuePair);
-            memberValuePairs.add(actionValuePair);
-            
-        }
-        return memberValuePairs;
-    }
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-        
-        List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-        
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-            IType type = method.getCompilationUnit().findPrimaryType();
-            
-            String memberValuePairName = memberValuePair.getName().getIdentifier();
-
-            if (memberValuePairName.equals(OPERATION_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(
-                        getOperationNameValue(type, method), memberValuePair.getValue()));
-            }
-            
-            if (memberValuePairName.equals(ACTION)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(
-                        getActionValue(type, method), memberValuePair.getValue()));
-            }
-
-        }
-        return completionProposals;
-    }
-
-    private String getOperationNameValue(IType type, IMethod method) {
-        try {
-            return method.getElementName() + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-    
-    private String getActionValue(IType type, IMethod method) {
-        try {
-            String methodName = method.getElementName();
-            return "urn:" + methodName.substring(0, 1).toUpperCase() 
-                + methodName.substring(1) + AnnotationUtils.accountForOverloadedMethods(type, method);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return "";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java
deleted file mode 100644
index 125592a..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebParamAttributeInitializer.java
+++ /dev/null
@@ -1,202 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ARG;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.BodyDeclaration;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.PackageDeclaration;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebParamAttributeInitializer extends AnnotationAttributeInitializer {
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(ASTNode astNode, AST ast,
-    Class<? extends Annotation> annotationClass) {
-        
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-        if (astNode instanceof SingleVariableDeclaration) {
-            MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME,
-            getName((SingleVariableDeclaration) astNode));
-            memberValuePairs.add(nameValuePair);
-        }
-        return memberValuePairs;
-    }
-
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(ASTNode astNode,
-            MemberValuePair memberValuePair) {
-        
-        List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-        if (astNode instanceof SingleVariableDeclaration) {
-            SingleVariableDeclaration parameter = (SingleVariableDeclaration) astNode;
-            String memberValuePairName = memberValuePair.getName().getIdentifier();
-            
-            if (memberValuePairName.equals(NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getName(parameter),
-                        memberValuePair.getValue()));
-            }
-            
-            if (memberValuePairName.equals(PART_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getPartName(parameter),
-                        memberValuePair.getValue()));
-            }
-            
-            if (memberValuePairName.equals(TARGET_NAMESPACE)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(parameter),
-                        memberValuePair.getValue()));
-            }
-            
-        }
-        return completionProposals;
-    }
-
-    private String getName(SingleVariableDeclaration parameter) {
-        MethodDeclaration methodDeclaration = (MethodDeclaration) parameter.getParent();
-        if (hasDocumentBareSOAPBinding(methodDeclaration)) {
-            return getWebMethodOperationName(methodDeclaration);
-        }
-
-        List<?> siblings = (List<?>) methodDeclaration.getStructuralProperty(parameter.getLocationInParent());
-        return ARG + siblings.indexOf(parameter);
-    }
-    
-    private String getPartName(SingleVariableDeclaration parameter) {
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter,
-                WebParam.class);
-        if (annotation != null) {
-            String name = AnnotationUtils.getStringValue(annotation, NAME);
-            if (name != null) {
-                return name;
-            }
-        }
-        return getName(parameter);
-    }
-    
-    private String getTargetNamespace(SingleVariableDeclaration parameter) {
-        if (hasDocumentWrappedSOAPBinding(parameter) && !isHeader(parameter)) {
-            return ""; 
-        }
-        return getDefaultTargetNamespace(parameter);
-    }
-
-    private String getDefaultTargetNamespace(SingleVariableDeclaration parameter) {
-        MethodDeclaration methodDeclaration = (MethodDeclaration) parameter.getParent();
-        TypeDeclaration typeDeclaration = (TypeDeclaration) methodDeclaration.getParent();
-        
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(typeDeclaration,
-                WebService.class);
-        if (annotation != null) {
-            String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
-            if (targetNamespace != null) {
-                return targetNamespace;
-            }
-        }
-        return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(typeDeclaration));
-    }
-
-    private String getPackageName(TypeDeclaration typeDeclaration) {
-        if (typeDeclaration.isPackageMemberTypeDeclaration()) {
-            PackageDeclaration packageDeclaration = ((CompilationUnit) typeDeclaration.getParent()).getPackage();
-            if (packageDeclaration != null) {
-                return packageDeclaration.getName().getFullyQualifiedName();
-            }          
-        }
-        return "";
-    }
-    
-    private boolean isHeader(SingleVariableDeclaration parameter) {
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(parameter, WebParam.class);
-        if (annotation != null) {
-            Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
-            if (header != null) {
-                return header.booleanValue();
-            }
-        }
-        return false;
-    }
-
-    private boolean hasDocumentWrappedSOAPBinding(SingleVariableDeclaration parameter) {
-        MethodDeclaration methodDeclaration = (MethodDeclaration) parameter.getParent();
-
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(methodDeclaration,
-                SOAPBinding.class);
-        if (annotation != null) {
-            return JAXWSUtils.isDocumentWrapped(annotation);
-        }
-        
-        TypeDeclaration typeDeclaration = (TypeDeclaration) methodDeclaration.getParent();
-        
-        org.eclipse.jdt.core.dom.Annotation typeAnnotation = AnnotationUtils.getAnnotation(typeDeclaration,
-                SOAPBinding.class);
-        if (typeAnnotation != null) {
-            return JAXWSUtils.isDocumentWrapped(typeAnnotation);
-        }
-        return true;
-    }
-
-    private boolean hasDocumentBareSOAPBinding(BodyDeclaration bodyDeclaration) {
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(bodyDeclaration,
-                SOAPBinding.class);
-        if (annotation != null) {
-            return JAXWSUtils.isDocumentBare(annotation);
-        }
-        if (bodyDeclaration instanceof MethodDeclaration) {
-            MethodDeclaration methodDeclaration = (MethodDeclaration) bodyDeclaration;
-            return hasDocumentBareSOAPBinding((TypeDeclaration) methodDeclaration.getParent());
-        }
-        return false;
-    }
-
-
-    private String getWebMethodOperationName(MethodDeclaration methodDeclaration) {
-        org.eclipse.jdt.core.dom.Annotation annotation = AnnotationUtils.getAnnotation(methodDeclaration,
-                WebMethod.class);
-        if (annotation != null) {
-            String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
-            if (operationName != null) {
-                return operationName;
-            }
-        }
-        return methodDeclaration.getName().getIdentifier();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java
deleted file mode 100644
index c128e60..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebResultAttributeInitializer.java
+++ /dev/null
@@ -1,211 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PART_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RESPONSE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.RETURN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebResultAttributeInitializer extends AnnotationAttributeInitializer {
-    
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-
-            MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(method));
-        
-            memberValuePairs.add(nameValuePair);
-        }
-        return memberValuePairs;
-    }
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-
-        List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-
-        if (javaElement.getElementType() == IJavaElement.METHOD) {
-            IMethod method = (IMethod) javaElement;
-
-            String memberValuePairName = memberValuePair.getName().getIdentifier();
-
-            if (memberValuePairName.equals(NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getName(method), memberValuePair
-                    .getValue()));
-            }
-            
-            if (memberValuePairName.equals(PART_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getPartName(method),
-                        memberValuePair.getValue()));
-            }
-            
-            if (memberValuePairName.equals(TARGET_NAMESPACE)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(method),
-                        memberValuePair.getValue()));
-            }
-
-        }
-        return completionProposals;
-    }
-    
-    private String getName(IMethod method) {
-        if (hasDocumentBareSOAPBinding(method)) {
-            return getOperationName(method) + RESPONSE;
-        }
-        return RETURN;
-    }
-
-    private String getOperationName(IMethod method) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(method, WebMethod.class);
-            if (annotation != null) {
-                String operationName = AnnotationUtils.getStringValue(annotation, OPERATION_NAME);
-                if (operationName != null) {
-                    return operationName;
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return method.getElementName();
-    }
-
-    private boolean hasDocumentBareSOAPBinding(IAnnotatable annotatable) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(annotatable, SOAPBinding.class);
-            if (annotation != null) {
-                return JAXWSUtils.isDocumentBare(annotation);
-            }
-            if (annotatable instanceof IMethod) {
-                IMethod method = (IMethod) annotatable;
-                return hasDocumentBareSOAPBinding((IType) method.getParent());
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return false;
-    }
-  
-    private String getPartName(IMethod method) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(method, WebResult.class);
-            if (annotation != null) {
-                String name = AnnotationUtils.getStringValue(annotation, NAME);
-                if (name != null) {
-                    return name;
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return getName(method);
-    }
-
-    private String getTargetNamespace(IMethod method) {
-        if (hasDocumentWrappedSOAPBinding(method) && !isHeader(method)) {
-            return ""; 
-        }
-        return getDefaultTargetNamespace(method);
-    }
-
-    private boolean hasDocumentWrappedSOAPBinding(IAnnotatable annotatable) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(annotatable, SOAPBinding.class);
-            if (annotation != null) {
-                return JAXWSUtils.isDocumentWrapped(annotation);
-            }
-            if (annotatable instanceof IMethod) {
-                IMethod method = (IMethod) annotatable;
-                return hasDocumentWrappedSOAPBinding((IType) method.getParent());
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return true;
-    }
-    
-    private boolean isHeader(IMethod method) {
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(method, WebResult.class);
-            if (annotation != null) {
-                Boolean header = AnnotationUtils.getBooleanValue(annotation, HEADER);
-                if (header != null) {
-                    return header.booleanValue();
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return false;
-    }
-
-    private String getDefaultTargetNamespace(IMethod method) {
-        IType type = method.getDeclaringType();
-        try {
-            IAnnotation annotation = AnnotationUtils.getAnnotation(type, WebService.class);
-            if (annotation != null) {
-                String targetNamespace = AnnotationUtils.getStringValue(annotation, TARGET_NAMESPACE);
-                if (targetNamespace != null) {
-                    return targetNamespace;
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-
-        return JDTUtils.getTargetNamespaceFromPackageName(getPackageName(type));
-    }
-
-    private String getPackageName(IType type) {
-        IPackageFragment packageFragment = type.getPackageFragment();
-        return packageFragment.getElementName();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.java
deleted file mode 100644
index 6ddc470..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/initialization/WebServiceAttributeInitializer.java
+++ /dev/null
@@ -1,162 +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.jaxws.core.annotations.initialization;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_SUFFIX;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.initialization.AnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceAttributeInitializer extends AnnotationAttributeInitializer {
-
-    @Override
-    public List<MemberValuePair> getMemberValuePairs(IJavaElement javaElement, AST ast,
-            Class<? extends Annotation> annotationClass) {
-        
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            try {
-                IType type = (IType)javaElement;
-    
-                MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, NAME, getName(type));
-        
-                MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, PORT_NAME, 
-                        getPortName(type));
-        
-                MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, SERVICE_NAME,
-                        getServiceName(type));
-    
-                MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                        TARGET_NAMESPACE, getTargetNamespace(type));
-    
-
-                if (type.isInterface()) {
-                    memberValuePairs.add(nameValuePair);
-                }
-
-                memberValuePairs.add(targetNamespaceValuePair);
-                
-                if (type.isClass()) {
-                    memberValuePairs.add(portNameValuePair);
-                    memberValuePairs.add(serviceNameValuePair);
-                }
-            } catch (JavaModelException jme) {
-                JAXWSCorePlugin.log(jme.getStatus());
-            }
-        }
-        return memberValuePairs;
-    }
-    
-    public List<ICompletionProposal> getCompletionProposalsForMemberValuePair(IJavaElement javaElement,
-            MemberValuePair memberValuePair) {
-
-        List<ICompletionProposal> completionProposals = new ArrayList<ICompletionProposal>();
-        if (javaElement.getElementType() == IJavaElement.TYPE) {
-            IType type = (IType) javaElement;
-
-            String memberValuePairName = memberValuePair.getName().getIdentifier();
-
-            if (memberValuePairName.equals(ENDPOINT_INTERFACE)) {
-                List<String> interfaces = getInterfaces(type);
-                for (String anInterface : interfaces) {
-                    completionProposals.add(AnnotationUtils.createCompletionProposal(anInterface,
-                            memberValuePair.getValue(), JavaUI.getSharedImages().getImage(
-                                    ISharedImages.IMG_OBJS_INTERFACE)));
-                }
-            }
-            if (memberValuePairName.equals(NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getName(type),
-                        memberValuePair.getValue()));
-            }
-            if (memberValuePairName.equals(PORT_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getPortName(type),
-                        memberValuePair.getValue()));
-            }
-            if (memberValuePairName.equals(SERVICE_NAME)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getServiceName(type),
-                        memberValuePair.getValue()));
-            }
-            if (memberValuePairName.equals(TARGET_NAMESPACE)) {
-                completionProposals.add(AnnotationUtils.createCompletionProposal(getTargetNamespace(type),
-                        memberValuePair.getValue()));
-            }
-        }
-        return completionProposals;
-    }
-
-    public String getName(IType type) {
-        return type.getElementName();
-    }
-    
-    public String getPortName(IType type) {
-        return type.getElementName() + PORT_SUFFIX;
-    }
-    
-    public String getServiceName(IType type) {
-        return type.getElementName() + SERVICE_SUFFIX;
-    }
-    
-    public String getTargetNamespace(IType type) {
-        return JDTUtils.getTargetNamespaceFromPackageName(type.getPackageFragment().getElementName());
-    }
-    
-    private List<String> getInterfaces(IType type) {
-        try {
-            List<String> interfaces = new ArrayList<String>();
-            ITypeHierarchy typeHierarchy = type.newTypeHierarchy(type.getJavaProject(), null);
-            IType[] allInterfaces = typeHierarchy.getAllInterfaces();
-            for (IType aInterface : allInterfaces) {
-                if (!aInterface.isBinary() && aInterface.getResource().getProject().equals(
-                        type.getResource().getProject())) {
-                    String packageName = aInterface.getPackageFragment().getElementName();
-                    if (packageName.trim().length() > 0) {
-                        packageName += "."; //$NON-NLS-1$
-                    }
-                    String qualifiedName = packageName + aInterface.getPrimaryElement().getElementName();
-                    interfaces.add(qualifiedName);
-                }
-            }
-            return interfaces;
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return Collections.emptyList();
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/AbstractJAXWSAnnotationProcessor.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/AbstractJAXWSAnnotationProcessor.java
deleted file mode 100644
index f171130..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/AbstractJAXWSAnnotationProcessor.java
+++ /dev/null
@@ -1,77 +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.jaxws.core.annotations.validation;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-
-/**
- * 
- * @author sclarke
- *
- */
-public abstract class AbstractJAXWSAnnotationProcessor extends AbstractAnnotationProcessor {
-
-    protected static final String CLASS_NAME = "className"; //$NON-NLS-1$
-    
-    protected static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
-    protected static final String EXCLUDE = "exclude"; //$NON-NLS-1$
-
-    protected static final String FAULT_BEAN = "faultBean"; //$NON-NLS-1$
-    protected static final String FINALIZE = "finalize"; //$NON-NLS-1$
-    protected static final String HEADER = "header"; //$NON-NLS-1$
-
-    protected static final String LOCAL_NAME = "localName"; //$NON-NLS-1$
-    protected static final String MODE = "mode"; //$NON-NLS-1$
-    protected static final String NAME = "name"; //$NON-NLS-1$    
-    protected static final String OPERATION_NAME = "operationName"; //$NON-NLS-1$
-
-    protected static final String PARAMETER_STYLE = "parameterStyle"; //$NON-NLS-1$
-    protected static final String PORT_NAME = "portName"; //$NON-NLS-1$
-    protected static final String SERVICE_NAME = "serviceName"; //$NON-NLS-1$
-
-    protected static final String STYLE = "style"; //$NON-NLS-1$
-    protected static final String TARGET_NAMESPACE = "targetNamespace"; //$NON-NLS-1$
-    protected static final String TRUE = "true"; //$NON-NLS-1$
-
-    protected static final String USE = "use"; //$NON-NLS-1$
-
-    protected static final String VALUE = "value"; //$NON-NLS-1$
-    protected static final String TYPE = "type"; //$NON-NLS-1$
-    
-    public abstract void process();
-
-    protected boolean isDocumentBare(AnnotationMirror mirror) {
-        String style = AnnotationUtils.getStringValue(mirror, STYLE);
-        String use = AnnotationUtils.getStringValue(mirror, USE);
-        String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-
-        return (style == null || style.equals(Style.DOCUMENT.name()))
-                && (use == null || use.equals(Use.LITERAL.name()))
-                && (parameterStyle != null && parameterStyle.equals(ParameterStyle.BARE.name()));
-    }
-    
-    protected boolean isDocumentWrapped(AnnotationMirror mirror) {
-        String style = AnnotationUtils.getStringValue(mirror, STYLE);
-        String use = AnnotationUtils.getStringValue(mirror, USE);
-        String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-
-        return (style == null || style.equals(Style.DOCUMENT.name()))
-                && (use == null || use.equals(Use.LITERAL.name()))
-                && (parameterStyle == null || parameterStyle.equals(ParameterStyle.WRAPPED.name()));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.java
deleted file mode 100644
index e48091b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HandlerChainRules.java
+++ /dev/null
@@ -1,71 +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.jaxws.core.annotations.validation;

-

-import java.util.Collection;

-

-import javax.jws.HandlerChain;

-

-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;

-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;

-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;

-

-import com.sun.mirror.declaration.AnnotationMirror;

-import com.sun.mirror.declaration.AnnotationTypeDeclaration;

-import com.sun.mirror.declaration.Declaration;

-import com.sun.mirror.declaration.FieldDeclaration;

-import com.sun.mirror.declaration.MethodDeclaration;

-import com.sun.mirror.declaration.TypeDeclaration;

-

-/**

- * 

- * @author sclarke

- * 

- */

-public class HandlerChainRules extends AbstractAnnotationProcessor {

-

-    @Override

-    public void process() {

-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment

-                .getTypeDeclaration(HandlerChain.class.getName());

-

-        Collection<Declaration> annotatedTypes = environment

-                .getDeclarationsAnnotatedWith(annotationDeclaration);

-

-        for (Declaration declaration : annotatedTypes) {

-            if (declaration instanceof TypeDeclaration) {

-                @SuppressWarnings("deprecation")

-                AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,

-                        javax.jws.soap.SOAPMessageHandlers.class);

-                if (annotationMirror != null) {

-                    printError(annotationMirror.getPosition(),

-                            JAXWSCoreMessages.HANDLER_CHAIN_SOAP_MESSAGE_HANDLERS);

-                }

-            }

-

-            if (declaration instanceof FieldDeclaration) {

-                AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,

-                        javax.jws.HandlerChain.class);

-                printError(annotationMirror.getPosition(),

-                        JAXWSCoreMessages.HANDLER_CHAIN_ON_FIELD);

-            }

-

-            if (declaration instanceof MethodDeclaration) {

-                AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,

-                        javax.jws.HandlerChain.class);

-

-                printError(annotationMirror.getPosition(),

-                        JAXWSCoreMessages.HANDLER_CHAIN_ON_METHOD);

-            }

-        }

-    }

-

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java
deleted file mode 100644
index c947964..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/HolderTypeParametersRule.java
+++ /dev/null
@@ -1,97 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
-
-import java.util.Collection;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class HolderTypeParametersRule extends AbstractAnnotationProcessor {
-    
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-             if (declaration instanceof TypeDeclaration) {
-                 validateParameters((TypeDeclaration) declaration);
-             }
-        }
-    }
-    
-    private void validateParameters(TypeDeclaration typeDeclaration) {
-        Collection<? extends MethodDeclaration> methods = typeDeclaration.getMethods();
-        for (MethodDeclaration methodDeclaration : methods) {
-            Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-            for (ParameterDeclaration parameter : parameters) {
-                TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameter.getType());
-                boolean isHolderParameter = typeMirror.toString().equals(Holder.class.getCanonicalName());
-                if (isWebParamOutInoutMode(parameter) && !isHolderParameter) {
-                    printError(parameter.getPosition(), 
-                                JAXWSCoreMessages.WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE);
-                } else if (isHolderParameter && isWebParamInMode(parameter)){
-                    printError(parameter.getPosition(),
-                            JAXWSCoreMessages.HOLDER_TYPE_MUST_BE_OUT_INOUT);
-                }
-            }
-        }
-    }
-    
-    private boolean isWebParamInMode(ParameterDeclaration parameter) {
-        String mode = getMode(parameter);
-        if (mode != null) {
-            return mode.equals(WebParam.Mode.IN.toString());
-        }
-        return false;
-    }
-
-    private boolean isWebParamOutInoutMode(ParameterDeclaration parameter) {
-        String mode = getMode(parameter);
-        if (mode != null) {
-            return mode.equals(WebParam.Mode.OUT.name()) || mode.equals(WebParam.Mode.INOUT.name());
-        }
-        return false;
-    }
-
-    private String getMode(ParameterDeclaration parameter) {
-        AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameter, WebParam.class);
-        if (webParam != null) {
-            return AnnotationUtils.getStringValue(webParam, MODE);
-        }
-        return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java
deleted file mode 100644
index f37021f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/OnewayRules.java
+++ /dev/null
@@ -1,69 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.Oneway;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class OnewayRules extends AbstractAnnotationProcessor {
-    
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(Oneway.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {        
-            if (declaration instanceof MethodDeclaration) {
-                MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-                if (!methodDeclaration.getReturnType().equals(environment.getTypeUtils().getVoidType())) {
-                   printError(annotationDeclaration, methodDeclaration,
-                            JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE); 
-                }
-                if (methodDeclaration.getThrownTypes().size() > 0) {
-                    printError(annotationDeclaration, methodDeclaration,
-                            JAXWSCoreMessages.ONEWAY_NO_CHECKED_EXCEPTIONS); 
-                }
-                checkParameters(methodDeclaration, annotationDeclaration);
-            }
-        }
-    }
-    
-    private void checkParameters(MethodDeclaration methodDeclaration,
-            AnnotationTypeDeclaration annotationDeclaration) {
-        Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-        for (ParameterDeclaration parameter : parameters) {
-            TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameter.getType());
-            if (typeMirror.toString().equals(Holder.class.getCanonicalName())) {
-                printError(annotationDeclaration, methodDeclaration,
-                        JAXWSCoreMessages.ONEWAY_NO_HOLDER_PARAMETERS);
-            }
-        }
-    }    
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java
deleted file mode 100644
index 1f27d86..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingDocumentBareRules.java
+++ /dev/null
@@ -1,242 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.HEADER;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.MODE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-
-import java.util.Collection;
-
-import javax.jws.Oneway;
-import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Holder;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.TypeMirror;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class SOAPBindingDocumentBareRules extends AbstractAnnotationProcessor {
-    
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-        .getTypeDeclaration(SOAPBinding.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-        
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof TypeDeclaration) {
-                TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
-                Collection<AnnotationMirror> annotationMirrors = typeDeclaration.getAnnotationMirrors();
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)) {
-                        if (JAXWSUtils.isDocumentBare(mirror)) {
-                            Collection<? extends MethodDeclaration> methodDeclarations = typeDeclaration.getMethods();
-                            for (MethodDeclaration methodDeclaration : methodDeclarations) {
-                                processMethod(methodDeclaration);    
-                            }
-                        }
-                    }
-                }
-            }
-            
-            if (declaration instanceof MethodDeclaration) {
-                MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-                Collection<AnnotationMirror> annotationMirrors = methodDeclaration.getAnnotationMirrors();
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)) {
-                        if (JAXWSUtils.isDocumentBare(mirror)) {
-                            processMethod((MethodDeclaration) declaration);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public void processMethod(MethodDeclaration methodDeclaration) {
-        Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-        
-        //@Oneway operations
-        if (isOneway(methodDeclaration) && !isSingleNonHeaderINParameter(parameters)) {
-            printError(methodDeclaration.getPosition(), 
-                JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER);                                
-        } else {
-            if (isVoidReturnType(methodDeclaration)) {
-                if (countINParameters(parameters) > 1) {
-                    printError(methodDeclaration.getPosition(), 
-                            JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER);                                                                        
-                }
-                if (countOUTParameters(parameters) > 1) {
-                    printError(methodDeclaration.getPosition(), 
-                            JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER);                                                                                            
-                }
-            } else {
-                if (countINParameters(parameters) > 1) {
-                    printError(methodDeclaration.getPosition(), 
-                        JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER);                                                                        
-                } 
-                if (countOUTParameters(parameters) > 0) {
-                    printError(methodDeclaration.getPosition(), 
-                        JAXWSCoreMessages.DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER);
-                }
-            }
-        }
-
-        //check for @WebParam.name attribute when @WebParam.Mode = OUT or INOUT
-//        for(ParameterDeclaration parameterDeclaration : parameters) {
-//            AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-//            if (annotationMirror != null) {
-//                String mode = getWebParamMode(annotationMirror, parameterDeclaration);
-//                String name = AnnotationUtils.getStringValue(annotationMirror, NAME);
-//                
-//                if (name == null && (mode.equals(Mode.OUT.name()) || mode.equals(Mode.INOUT.name()))) {
-//                    printError(annotationMirror.getPosition(), 
-//                       JAXWSCoreMessages.WEBPARAM_NAME_REQUIRED_WHEN_DOC_BARE_OUT_INOUT);
-//                }
-//            }
-//        }
-    }
-    
-    private boolean isOneway(MethodDeclaration methodDeclaration) {
-        AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
-        if (oneway != null) {
-            return true;
-        }
-        return false;
-    }
-    
-    private boolean isVoidReturnType(MethodDeclaration methodDeclaration) {
-        return methodDeclaration.getReturnType().equals(environment.getTypeUtils().getVoidType());
-    }
-    
-    private boolean isSingleNonHeaderINParameter(Collection<ParameterDeclaration> parameters) {
-        return countNonHeaderINParameters(parameters) <= 1;
-    }
-    
-    private int countNonHeaderINParameters(Collection<ParameterDeclaration> parameters) {
-        int inNonHeaderParameters = 0;
-        for (ParameterDeclaration parameterDeclaration : parameters) {
-            if (isNonHeaderINParameter(parameterDeclaration)) {
-                inNonHeaderParameters++;
-            }
-        }
-        return inNonHeaderParameters;
-    }
-    
-    private boolean isNonHeaderINParameter(ParameterDeclaration parameterDeclaration) {
-        AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-        if (webParam != null) {
-            return getWebParamMode(webParam, parameterDeclaration).equals(Mode.IN.name())
-              && !isHeader(webParam);
-        }
-        
-        if (getDefaultWebParamMode(parameterDeclaration).equals(Mode.IN.name())) {
-            return true;
-        }
-        
-        return false;
-    }
-    
-    private int countINParameters(Collection<ParameterDeclaration> parameters) {
-        int inNonHeaderParameters = 0;
-        for (ParameterDeclaration parameterDeclaration : parameters) {
-            if (isINParameter(parameterDeclaration)) {
-                inNonHeaderParameters++;
-            }
-        }
-        return inNonHeaderParameters;
-    }
- 
-    private boolean isINParameter(ParameterDeclaration parameterDeclaration) {
-        AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-        if (webParam != null) {
-            String mode = getWebParamMode(webParam, parameterDeclaration);
-            return (mode.equals(Mode.IN.name()) || mode.equals(Mode.INOUT.name()))
-                    && !isHeader(webParam);
-        }
-        
-        String defaultMode = getDefaultWebParamMode(parameterDeclaration);
-        if (defaultMode.equals(Mode.IN.name()) || defaultMode.equals(Mode.INOUT.name())) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private int countOUTParameters(Collection<ParameterDeclaration> parameters) {
-        int outNonHeaderParameters = 0;
-        for (ParameterDeclaration parameterDeclaration : parameters) {
-            if (isOUTParameter(parameterDeclaration)) {
-                outNonHeaderParameters++;
-            }
-        }
-        return outNonHeaderParameters;
-    }
-
-    private boolean isOUTParameter(ParameterDeclaration parameterDeclaration) {
-        AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-        if (webParam != null) {
-            String mode = getWebParamMode(webParam, parameterDeclaration);
-            return (mode.equals(Mode.OUT.name()) || mode.equals(Mode.INOUT.name()))
-                    && !isHeader(webParam);
-        }
-        
-        if (getDefaultWebParamMode(parameterDeclaration).equals(Mode.INOUT.name())) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private boolean isHeader(AnnotationMirror annotationMirror) {
-        Boolean header = AnnotationUtils.getBooleanValue(annotationMirror, HEADER);
-        if (header != null) {
-           return header.booleanValue();
-        }
-        return false;
-    }
-    
-    private String getWebParamMode(AnnotationMirror annotationMirror, ParameterDeclaration parameterDeclaration) {
-        String mode = AnnotationUtils.getStringValue(annotationMirror, MODE);
-        if (mode == null || mode.length() == 0) {
-            mode = getDefaultWebParamMode(parameterDeclaration);
-        }
-        return mode;
-    }
-    
-    private String getDefaultWebParamMode(ParameterDeclaration parameterDeclaration) {
-        TypeMirror typeMirror = environment.getTypeUtils().getErasure(parameterDeclaration.getType());
-        if (typeMirror.toString().equals(Holder.class.getCanonicalName())) {
-            return Mode.INOUT.name();
-        }
-        return Mode.IN.name();
-    }
-    
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.java
deleted file mode 100644
index a86aedf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodStyleDocumentRule.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.internal.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.STYLE;
-
-import java.util.Collection;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.apt.Messager;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class SOAPBindingMethodStyleDocumentRule extends AbstractAnnotationProcessor {
-    
-    @Override
-    public void process() {
-        Messager messager = environment.getMessager();
-
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(SOAPBinding.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
-                annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof MethodDeclaration) {
-
-                Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-    
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)) {
-                        String style = AnnotationUtils.getStringValue(mirror, STYLE);
-                        if (style != null && style.equals(Style.RPC.toString())) {
-                            messager.printError(mirror.getPosition(), 
-                              JAXWSCoreMessages.SOAPBINDING_ON_METHOD_STYLE_DOCUMENT_ONLY); 
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java
deleted file mode 100644
index 15cabc4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/SOAPBindingMethodUseRule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Progress Software Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PARAMETER_STYLE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.USE;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.Set;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.EnumConstantDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-
-/**
- * 
- * @author ohurley
- *
- */
-public class SOAPBindingMethodUseRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(SOAPBinding.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-        
-        boolean methodUseEncoded = false;
-        boolean methodParameterStylePresent = false;
-        
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof MethodDeclaration) {
-
-                Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-    
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    Map<AnnotationTypeElementDeclaration, AnnotationValue> valueMap = mirror
-                            .getElementValues();
-                    Set<Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue>> valueSet = valueMap
-                            .entrySet();
-                    for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> annotationKeyValue : 
-                            valueSet) {
-
-                        if (annotationKeyValue.getKey().getSimpleName().equals(USE)) {
-                            if (annotationKeyValue.getValue() != null) {
-                                AnnotationValue annotationValue = annotationKeyValue.getValue();
-                                EnumConstantDeclaration enumConstantDeclaration = 
-                                    (EnumConstantDeclaration) annotationValue.getValue();
-                                if (enumConstantDeclaration.getSimpleName().equals(
-                                        javax.jws.soap.SOAPBinding.Use.ENCODED.name())) {
-                                	methodUseEncoded = true;
-                                }
-                            }
-                        } else {
-                        	if (annotationKeyValue.getKey().getSimpleName().equals(PARAMETER_STYLE)) {
-                        		methodParameterStylePresent = true;
-                        	}
-                        }
-                        
-                        if (methodParameterStylePresent && methodUseEncoded) {
-                            printError(mirror.getPosition(),
-                                    JAXWSCoreMessages.SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED);
-                        	return;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
deleted file mode 100644
index 5076c4d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/UniqueNamesRule.java
+++ /dev/null
@@ -1,263 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.CLASS_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.FAULT_BEAN;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.OPERATION_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TARGET_NAMESPACE;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.WebFault;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.ReferenceType;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class UniqueNamesRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration webServiceDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(webServiceDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof TypeDeclaration) {
-                TypeDeclaration typeDeclaration = (TypeDeclaration) declaration;
-                checkOperationNames(typeDeclaration.getMethods());
-                checkWrapperAndFaultBeanNames(typeDeclaration.getMethods());
-                //checkDocumentBareMethods(typeDeclaration.getMethods());
-            }
-        }
-    }
-    
-    private void checkOperationNames(Collection<? extends MethodDeclaration> methods) {
-        Map<MethodDeclaration, QName> methodNameMap = new HashMap<MethodDeclaration, QName>();
-        for (MethodDeclaration methodDeclaration : methods) {
-            methodNameMap.put(methodDeclaration, new QName(getTargetNamespace(methodDeclaration.getDeclaringType()), 
-                    getOperationName(methodDeclaration)));
-        }
-        
-        MethodDeclaration[] keys = methodNameMap.keySet().toArray(new MethodDeclaration[methodNameMap.size()]);
-        QName[] values = methodNameMap.values().toArray(new QName[methodNameMap.size()]);
-
-        for (int i = 0; i < values.length; i++) {
-            QName name = values[i];
-            for (int j = i + 1; j < values.length; j++) {
-                QName otherName = values[j];
-                if (name.equals(otherName)) {
-                    printError(keys[i].getPosition(), JAXWSCoreMessages.bind(
-                            JAXWSCoreMessages.OPERATION_NAMES_MUST_BE_UNIQUE_ERROR, name));
-                    printError(keys[j].getPosition(), JAXWSCoreMessages.bind(
-                            JAXWSCoreMessages.OPERATION_NAMES_MUST_BE_UNIQUE_ERROR, otherName));
-                }
-            }
-        }
-    }
-        
-    private String getAttributeValue(Declaration declaration, Class<? extends Annotation> annotation, String attributeName) {
-        AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration, annotation);
-        if (annotationMirror != null) {
-            return AnnotationUtils.getStringValue(annotationMirror, attributeName);
-        }
-        return null;
-    }
-
-    private void checkWrapperAndFaultBeanNames(Collection<? extends MethodDeclaration> methodDeclarations) {
-        AnnotationTypeDeclaration requestWrapperDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(RequestWrapper.class.getName());
-
-        AnnotationTypeDeclaration resposeWrapperDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(ResponseWrapper.class.getName());
-
-        Set<Declaration> methods = new HashSet<Declaration>();
-        methods.addAll(environment.getDeclarationsAnnotatedWith(requestWrapperDeclaration));
-        methods.addAll(environment.getDeclarationsAnnotatedWith(resposeWrapperDeclaration));
-
-        List<AnnotationValue> classNames = new ArrayList<AnnotationValue>();
-
-        for (Declaration declaration : methods) {
-            AnnotationMirror requestWrapper = AnnotationUtils
-                    .getAnnotation(declaration, RequestWrapper.class);
-            if (requestWrapper != null) {
-                AnnotationValue className = AnnotationUtils.getAnnotationValue(requestWrapper, CLASS_NAME);
-                if (className != null) {
-                    classNames.add(className);
-                }
-
-            }
-            AnnotationMirror responseWrapper = AnnotationUtils.getAnnotation(declaration,
-                    ResponseWrapper.class);
-            if (responseWrapper != null) {
-                AnnotationValue className = AnnotationUtils.getAnnotationValue(responseWrapper, CLASS_NAME);
-                if (className != null) {
-                    classNames.add(className);
-                }
-            }
-
-        }
-        
-        Set<ReferenceType> thrownTypes = new HashSet<ReferenceType>();
-        
-        for (MethodDeclaration methodDeclaration : methodDeclarations) {
-            thrownTypes.addAll(methodDeclaration.getThrownTypes());
-        }
-
-        for (ReferenceType referenceType : thrownTypes) {
-            if (referenceType instanceof ClassDeclaration) {
-                ClassDeclaration classDeclaration = (ClassDeclaration) referenceType;
-                AnnotationMirror webFault = AnnotationUtils.getAnnotation(classDeclaration, WebFault.class);
-                if (webFault != null) {
-                    AnnotationValue annotationValue = AnnotationUtils.getAnnotationValue(webFault, FAULT_BEAN);
-                    if (annotationValue != null) {
-                        classNames.add(annotationValue);
-                    }
-                }
-            }
-        }
-
-        for (int i = 0; i < classNames.size(); i++) {
-            AnnotationValue className = classNames.get(i);
-            for (int j = i + 1; j < classNames.size(); j++) {
-                AnnotationValue otherClassName = classNames.get(j);
-                if (className.getValue().toString().equalsIgnoreCase(otherClassName.getValue().toString())) {
-                    printError(className.getPosition(), JAXWSCoreMessages.bind(
-                            JAXWSCoreMessages.WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE, className));
-                    printError(otherClassName.getPosition(), JAXWSCoreMessages.bind(
-                            JAXWSCoreMessages.WRAPPER_FAULT_BEAN_NAMES_MUST_BE_UNIQUE, otherClassName));
-                }
-            }
-        }
-    }
-    
-    private void checkDocumentBareMethods(Collection<? extends MethodDeclaration> methods) {
-        List<MethodDeclaration> docBareMethods = new ArrayList<MethodDeclaration>();
-        for (MethodDeclaration methodDeclaration : methods) {
-            if (hasDocumentBareSOAPBinding(methodDeclaration)) {
-                docBareMethods.add(methodDeclaration);
-            }
-        }
-        
-        Map<AnnotationValue, QName> qNames = new HashMap<AnnotationValue, QName>();
-        for (MethodDeclaration methodDeclaration : docBareMethods) {
-            AnnotationMirror webResult = AnnotationUtils.getAnnotation(methodDeclaration, WebResult.class);
-            if (webResult != null) {
-                AnnotationValue name = AnnotationUtils.getAnnotationValue(webResult, NAME);
-                if (name != null) {
-                    QName qName = new QName(getTargetNamespace(webResult, methodDeclaration), name.getValue().toString());
-                    qNames.put(name, qName);
-                }
-            }
-            Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-            for (ParameterDeclaration parameterDeclaration : parameters) {
-                AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration, WebParam.class);
-                if (webParam != null) {
-                    AnnotationValue name = AnnotationUtils.getAnnotationValue(webParam, NAME);
-                    if (name != null) {
-                        QName qName = new QName(getTargetNamespace(webParam, methodDeclaration), name.getValue().toString());
-                        qNames.put(name, qName);
-                    }
-                }
-            }
-        }
-        
-        AnnotationValue[] keys =  qNames.keySet().toArray(new AnnotationValue[qNames.size()]);
-        QName[] values = qNames.values().toArray(new QName[qNames.size()]);
-       
-        for(int i = 0; i < values.length; i++) {
-            QName name = values[i];
-            for(int j = i + 1; j < values.length; j++) {
-                QName otherName = values[j];
-                if (name.equals(otherName)) {
-                    printError(keys[i].getPosition(), JAXWSCoreMessages.bind( 
-                            JAXWSCoreMessages.DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS, name));
-                    printError(keys[j].getPosition(), JAXWSCoreMessages.bind( 
-                            JAXWSCoreMessages.DOC_BARE_METHODS_UNIQUE_XML_ELEMENTS, otherName));
-                }
-            }
-        }
-    }
-
-    private String getTargetNamespace(TypeDeclaration typeDeclaration) {
-        String targetNamespace = getAttributeValue(typeDeclaration, WebService.class, TARGET_NAMESPACE);
-        if (targetNamespace != null) {
-            return targetNamespace;
-        }
-        
-        return JDTUtils.getTargetNamespaceFromPackageName(typeDeclaration.getPackage().getQualifiedName());
-    }
-    
-    private String getTargetNamespace(AnnotationMirror annotationMirror, MethodDeclaration methodDeclaration) {
-        String targetNamespace = AnnotationUtils.getStringValue(annotationMirror, TARGET_NAMESPACE);
-        if (targetNamespace == null) {
-            targetNamespace = getTargetNamespace(methodDeclaration.getDeclaringType());
-        }
-        return targetNamespace;
-    }
-
-    private String getOperationName(MethodDeclaration methodDeclaration) {
-        String operationName = getAttributeValue(methodDeclaration, WebMethod.class, OPERATION_NAME);
-        if (operationName != null) {
-            return operationName;
-        }
-        return methodDeclaration.getSimpleName();
-    }
-
-    private boolean hasDocumentBareSOAPBinding(Declaration declaration) {
-        AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(declaration, SOAPBinding.class);
-        if (soapBinding != null) {
-            return JAXWSUtils.isDocumentBare(soapBinding);
-        }
-        if (declaration instanceof MethodDeclaration) {
-            MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-            return hasDocumentBareSOAPBinding(methodDeclaration.getDeclaringType());
-        }
-        
-        return false;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java
deleted file mode 100644
index 2513200..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodCheckForWebServiceRule.java
+++ /dev/null
@@ -1,58 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodCheckForWebServiceRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-         AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebMethod.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-            for (AnnotationMirror mirror : annotationMirrors) {
-                if (mirror.getAnnotationType().getDeclaration().equals(annotationDeclaration)
-                        && !checkForWebServiceAnnotation(((MethodDeclaration) declaration).getDeclaringType())) {
-                    printError(mirror.getPosition(),
-                            JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE);
-                }
-            }
-        }
-    }
-    
-    private boolean checkForWebServiceAnnotation(TypeDeclaration typeDeclaration) {
-        return AnnotationUtils.getAnnotation(typeDeclaration, WebService.class) != null;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java
deleted file mode 100644
index 2bfbc6c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodExcludeRules.java
+++ /dev/null
@@ -1,72 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.EXCLUDE;
-
-import java.util.Collection;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodExcludeRules extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebMethod.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
-                annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-            for (AnnotationMirror annotationMirror : annotationMirrors) {
-                AnnotationValue excludeAttribute = AnnotationUtils.getAnnotationValue(annotationMirror,
-                        EXCLUDE);
-                if (excludeAttribute != null) {
-                    MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-                    TypeDeclaration typeDeclaration = methodDeclaration.getDeclaringType();
-                    
-                    if (typeDeclaration instanceof InterfaceDeclaration) {
-                        printError(excludeAttribute.getPosition(),
-                                JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI);
-                    }
-
-                    if (typeDeclaration instanceof ClassDeclaration
-                            && Boolean.valueOf(excludeAttribute.getValue().toString()).booleanValue()) {
-                        printError(
-                                excludeAttribute.getPosition(),
-                                JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED);
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java
deleted file mode 100644
index 6e81324..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebMethodPublicStaticFinalRule.java
+++ /dev/null
@@ -1,62 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.Modifier;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebMethodPublicStaticFinalRule extends AbstractAnnotationProcessor {
-	
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebMethod.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment.getDeclarationsAnnotatedWith(
-                annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-        	if (declaration instanceof MethodDeclaration) {
-        	    MethodDeclaration methodDeclaration = (MethodDeclaration) declaration;
-        	    if (methodDeclaration.getDeclaringType() instanceof ClassDeclaration) {
-                    Collection<Modifier> modifiers = methodDeclaration.getModifiers();
-                    if (!modifiers.contains(Modifier.PUBLIC)) {
-                        printError(annotationDeclaration, methodDeclaration,
-                                JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS);
-                    }
-                    if (modifiers.contains(Modifier.FINAL)) {
-                        printError(annotationDeclaration, methodDeclaration,
-                                JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED);
-                    }
-                    if (modifiers.contains(Modifier.STATIC)) {
-                        printError(annotationDeclaration, methodDeclaration,
-                                JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED);
-                    }
-        	    }
-        	}
-        }
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java
deleted file mode 100644
index 1e6af4d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceDefaultPublicConstructorRule.java
+++ /dev/null
@@ -1,72 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.ConstructorDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceDefaultPublicConstructorRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof ClassDeclaration) {
-                boolean hasDefaultConstructor = false;
-                ClassDeclaration classDeclaration = (ClassDeclaration) declaration;
-                Collection<ConstructorDeclaration> constructors = classDeclaration.getConstructors();
-                if (constructors.size() == 0) {
-                    hasDefaultConstructor = true;
-                } else {
-                    for (ConstructorDeclaration constructorDeclaration : constructors) {
-                        if (constructorDeclaration.getModifiers().contains(Modifier.PUBLIC) && 
-                                constructorDeclaration.getParameters().size() == 0) {
-                            hasDefaultConstructor = true;
-                            break;
-                        }
-                    }
-                }
-                if (!hasDefaultConstructor) {
-                    Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-                    for (AnnotationMirror mirror : annotationMirrors) {
-                        if ( mirror.getAnnotationType().toString().equals(annotationDeclaration
-                                .getQualifiedName())) {
-                            printError(mirror.getPosition(),
-                                    JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR); 
-                        }
-                    }
-                }                
-            }
-        }
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java
deleted file mode 100644
index 329b694..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceNoFinalizeMethodRule.java
+++ /dev/null
@@ -1,67 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.FINALIZE;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceNoFinalizeMethodRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (isFinalizeDefined(declaration)) {
-                AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(declaration,
-                        WebService.class);
-                printError(annotationMirror.getPosition(),
-                        JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE);
-            }
-        }
-    }
-    
-    private boolean isFinalizeDefined(Declaration declaration) {
-        if (declaration instanceof TypeDeclaration) {
-            TypeDeclaration typeDeclaration = (TypeDeclaration)declaration;
-            Collection<? extends MethodDeclaration> methodDeclarations = typeDeclaration.getMethods();
-            for (MethodDeclaration methodDeclaration : methodDeclarations) {
-                if (methodDeclaration.getSimpleName().equals(FINALIZE) 
-                        && methodDeclaration.getParameters().size() == 0) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java
deleted file mode 100644
index e36b330..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServicePublicAbstractFinalRule.java
+++ /dev/null
@@ -1,75 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServicePublicAbstractFinalRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof TypeDeclaration) {
-                Collection<Modifier> modifiers = declaration.getModifiers();
-                if (modifiers.contains(Modifier.FINAL) || modifiers.contains(Modifier.ABSTRACT) 
-                     || !modifiers.contains(Modifier.PUBLIC)) {
-                    Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-                    for (AnnotationMirror mirror : annotationMirrors) {
-                        if (mirror.getAnnotationType().toString()
-                            .equals(annotationDeclaration.getQualifiedName())) {
-                            printError(mirror.getPosition(), 
-                                JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL);
-                        }
-                    }
-                }
-                TypeDeclaration typeDeclaration = (TypeDeclaration)declaration;
-                if (typeDeclaration.getNestedTypes().size() > 0) {
-                    testNestedTypes(typeDeclaration.getNestedTypes(), annotationDeclaration);
-                }
-            }
-        }
-    }
-    
-    private void testNestedTypes(Collection<TypeDeclaration> nestedTypes, 
-            AnnotationTypeDeclaration annotationDeclaration) {
-        for (TypeDeclaration nestedDeclaration : nestedTypes) {
-            Collection<AnnotationMirror> annotationMirrors = nestedDeclaration.getAnnotationMirrors();
-            for (AnnotationMirror mirror : annotationMirrors) {
-                if (mirror.getAnnotationType().toString().equals(annotationDeclaration.getQualifiedName())) {
-                    printError(mirror.getPosition(),
-                            JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL);
-                }
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java
deleted file mode 100644
index 9c5ad70..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceRefsRules.java
+++ /dev/null
@@ -1,88 +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.jaxws.core.annotations.validation;

-

-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;

-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.TYPE;

-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.VALUE;

-

-import java.util.Collection;

-import java.util.List;

-

-import javax.xml.ws.WebServiceRefs;

-

-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;

-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;

-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;

-

-import com.sun.mirror.declaration.AnnotationMirror;

-import com.sun.mirror.declaration.AnnotationTypeDeclaration;

-import com.sun.mirror.declaration.AnnotationValue;

-import com.sun.mirror.declaration.ClassDeclaration;

-import com.sun.mirror.declaration.Declaration;

-

-/**

- * 

- * @author sclarke

- * 

- */

-public class WebServiceRefsRules extends AbstractAnnotationProcessor {

-

-    @Override

-    public void process() {

-        AnnotationTypeDeclaration annotationTypeDeclaration = (AnnotationTypeDeclaration) environment

-                .getTypeDeclaration(WebServiceRefs.class.getName());

-

-        Collection<Declaration> annotatedTypes = environment

-                .getDeclarationsAnnotatedWith(annotationTypeDeclaration);

-

-        for (Declaration declaration : annotatedTypes) {

-            AnnotationMirror webServiceRefs = AnnotationUtils

-                    .getAnnotation(declaration, WebServiceRefs.class);

-

-            AnnotationValue webServiceRefsValue = AnnotationUtils.getAnnotationValue(webServiceRefs, VALUE);

-

-            if (webServiceRefsValue != null && webServiceRefsValue.getValue() instanceof List<?>) {

-                List<AnnotationValue> value = (List<AnnotationValue>) webServiceRefsValue.getValue();

-

-                for (AnnotationValue annotationValue : value) {

-                    if (annotationValue.getValue() instanceof AnnotationMirror) {

-                        AnnotationMirror webServiceRef = (AnnotationMirror) annotationValue.getValue();

-

-                        String webServiceRefName = AnnotationUtils.getStringValue(webServiceRef, NAME);

-                        if (webServiceRefName == null || webServiceRefName.trim().length() == 0) {

-                            printError(webServiceRef.getPosition(),

-                                    JAXWSCoreMessages.WEBSERVICEREFS_NAME_REQUIRED);

-                        }

-

-                        AnnotationValue webServiceRefNameType = AnnotationUtils.getAnnotationValue(

-                                webServiceRef, TYPE);

-                        if (webServiceRefNameType != null && webServiceRefNameType instanceof AnnotationValue) {

-                            AnnotationValue type = (AnnotationValue) webServiceRefNameType;

-                            if (type.getValue() instanceof ClassDeclaration) {

-                                ClassDeclaration classDeclaration = (ClassDeclaration) type.getValue();

-                                if (classDeclaration.getQualifiedName().equals(

-                                        java.lang.Object.class.getCanonicalName())) {

-                                    printError(webServiceRef.getPosition(),

-                                            JAXWSCoreMessages.WEBSERVICEREFS_TYPE_REQUIRED);

-                                }

-                            }

-                        } else {

-                            printError(webServiceRef.getPosition(),

-                                    JAXWSCoreMessages.WEBSERVICEREFS_TYPE_REQUIRED);

-                        }

-                    }

-                }

-            }

-        }

-    }

-

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java
deleted file mode 100644
index 2bc7212..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIAllowedAttributesRule.java
+++ /dev/null
@@ -1,71 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.PORT_NAME;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.SERVICE_NAME;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceSEIAllowedAttributesRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof InterfaceDeclaration) {
-                Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    String serviceName = AnnotationUtils.getStringValue(mirror, SERVICE_NAME);
-                    if (serviceName != null) {
-                        printError(mirror.getPosition(),
-                                JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI);
-                    }
-
-                    String endpointInterface = AnnotationUtils.getStringValue(mirror, ENDPOINT_INTERFACE);
-                    if (endpointInterface != null) {
-                        printError(mirror.getPosition(),
-                                JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI);
-                    }
-                    String portName = AnnotationUtils.getStringValue(mirror, PORT_NAME);
-                    if (portName != null) {
-                        printError(mirror.getPosition(),
-                                JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI);
-                    }
-                }
-            }
-        }
-    }
-   
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java
deleted file mode 100644
index 9d07f7f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceSEIRestrictionsRule.java
+++ /dev/null
@@ -1,195 +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.jaxws.core.annotations.validation;
-
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.ENDPOINT_INTERFACE;
-import static org.eclipse.jst.ws.internal.jaxws.core.utils.JAXWSUtils.NAME;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.ClassDeclaration;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.InterfaceDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.Modifier;
-import com.sun.mirror.declaration.ParameterDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEIRestrictionsRule extends AbstractAnnotationProcessor {
-
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-        for (Declaration declaration : annotatedTypes) {
-            if (declaration instanceof ClassDeclaration) {
-                Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-                for (AnnotationMirror mirror : annotationMirrors) {
-                    AnnotationValue endpointInterface = AnnotationUtils.getAnnotationValue(mirror,
-                            ENDPOINT_INTERFACE);
-                    if (endpointInterface != null) {
-                        AnnotationValue name = AnnotationUtils.getAnnotationValue(mirror, NAME);
-                        if (name != null) {
-                            printError(
-                                    name.getPosition(),
-                                    JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_NAME_ATTRIBUTE);
-                        }
-                        checkRestrictions((ClassDeclaration) declaration, endpointInterface);
-                        checkJSR181Annotations((ClassDeclaration) declaration);
-                    }
-                }
-            }
-        }
-    }
-
-    private void checkRestrictions(ClassDeclaration classDeclaration, AnnotationValue endpointInterface) {
-        String sei = endpointInterface.getValue().toString();
-        if ((JDTUtils.validateJavaTypeName(sei).getSeverity() == IStatus.ERROR)) {
-            return;
-        }
-        com.sun.mirror.declaration.TypeDeclaration typeDeclaration = environment.getTypeDeclaration(sei);
-        if (typeDeclaration != null) {
-            if (!(typeDeclaration instanceof InterfaceDeclaration)) {
-                printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_INTERFACE, sei));
-            }
-            if (typeDeclaration.getDeclaringType() != null) {
-                printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_OUTER, sei));
-            }
-            AnnotationMirror annotationMirror = AnnotationUtils.getAnnotation(typeDeclaration,
-                    WebService.class);
-            if (annotationMirror == null) {
-                printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_ANNOTATED, sei));
-            }
-
-            if (!typeDeclaration.getModifiers().contains(Modifier.PUBLIC)) {
-                printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_PUBLIC, sei));
-            }
-
-            if (!classDeclaration.getSuperinterfaces().contains(typeDeclaration)) {
-                Collection<? extends MethodDeclaration> seiMethods = typeDeclaration.getMethods();
-                Collection<? extends MethodDeclaration> implMethods = classDeclaration.getMethods();
-                
-                for (MethodDeclaration seiMethod : seiMethods) {
-                    boolean implemented = false;
-                    for (MethodDeclaration implMethod : implMethods) {
-                        
-                        if (AnnotationUtils.compareMethods(seiMethod, implMethod)) {
-                            implemented = true;
-                            break;
-                        }
-                    }
-                    if (!implemented) {
-                        printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                                JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_MUST_IMPLEMENT,
-                                getImplementsMessage(typeDeclaration, seiMethod)));
-                    }
-                }
-            }
-        } else {
-            printError(endpointInterface.getPosition(), JAXWSCoreMessages.bind(
-                    JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NOT_FOUND, sei));
-        }
-    }
-
-    private String getImplementsMessage(TypeDeclaration typeDeclaration, MethodDeclaration seiMethod) {
-        StringBuilder message = new StringBuilder(typeDeclaration.getSimpleName());
-        message.append(".");
-        message.append(seiMethod.getSimpleName());
-        message.append("(");
-        Collection<ParameterDeclaration> parameters = seiMethod.getParameters();
-        Iterator<ParameterDeclaration> iter = parameters.iterator();
-        while (iter.hasNext()) {
-            ParameterDeclaration parameterDeclaration = iter.next();
-            String typeMirror = environment.getTypeUtils().getErasure(parameterDeclaration.getType()).toString();
-            message.append(typeMirror.substring(typeMirror.lastIndexOf(".") + 1));
-            if (iter.hasNext()) {
-                message.append(", ");
-            }
-            
-        }
-        message.append(")");
-        return message.toString();
-    }
-
-    private void checkJSR181Annotations(ClassDeclaration classDeclaration) {
-        AnnotationMirror soapBinding = AnnotationUtils.getAnnotation(classDeclaration, SOAPBinding.class);
-        if (soapBinding != null) {
-            printError(soapBinding.getPosition(),
-                    JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING);
-        }
-
-        Collection<? extends com.sun.mirror.declaration.MethodDeclaration> implMethods = classDeclaration
-                .getMethods();
-        for (com.sun.mirror.declaration.MethodDeclaration methodDeclaration : implMethods) {
-            AnnotationMirror msoapBinding = AnnotationUtils.getAnnotation(methodDeclaration,
-                    SOAPBinding.class);
-            if (msoapBinding != null) {
-                printError(msoapBinding.getPosition(),
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING);
-            }
-
-            AnnotationMirror oneway = AnnotationUtils.getAnnotation(methodDeclaration, Oneway.class);
-            if (oneway != null) {
-                printError(oneway.getPosition(),
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY);
-            }
-
-            AnnotationMirror webMethod = AnnotationUtils.getAnnotation(methodDeclaration, WebMethod.class);
-            if (webMethod != null) {
-                printError(webMethod.getPosition(),
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS);
-            }
-            AnnotationMirror webResult = AnnotationUtils.getAnnotation(methodDeclaration, WebResult.class);
-            if (webResult != null) {
-                printError(webResult.getPosition(),
-                        JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT);
-            }
-
-            Collection<ParameterDeclaration> parameters = methodDeclaration.getParameters();
-            for (ParameterDeclaration parameterDeclaration : parameters) {
-                AnnotationMirror webParam = AnnotationUtils.getAnnotation(parameterDeclaration,
-                        WebParam.class);
-                if (webParam != null) {
-                    printError(webParam.getPosition(),
-                            JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM);
-                }
-            }
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java
deleted file mode 100644
index 1e8a5bb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/annotations/validation/WebServiceWebServiceProviderCoExistRule.java
+++ /dev/null
@@ -1,55 +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.jaxws.core.annotations.validation;
-
-import java.util.Collection;
-
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceProvider;
-
-import org.eclipse.jst.ws.annotations.core.processor.AbstractAnnotationProcessor;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.Declaration;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceWebServiceProviderCoExistRule extends AbstractAnnotationProcessor {
-    
-    @Override
-    public void process() {
-        AnnotationTypeDeclaration annotationDeclaration = (AnnotationTypeDeclaration) environment
-                .getTypeDeclaration(WebService.class.getName());
-
-        Collection<Declaration> annotatedTypes = environment
-                .getDeclarationsAnnotatedWith(annotationDeclaration);
-
-        for (Declaration declaration : annotatedTypes) {
-            Collection<AnnotationMirror> annotationMirrors = declaration.getAnnotationMirrors();
-
-            for (AnnotationMirror mirror : annotationMirrors) {
-                checkWebServiceProvider(mirror);
-            }
-        }
-    }
-
-    private void checkWebServiceProvider(AnnotationMirror mirror) {
-        if (mirror.getAnnotationType().toString().equals(WebServiceProvider.class.getName())) {
-            printError(mirror.getPosition(), JAXWSCoreMessages
-                    .WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION);
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java
deleted file mode 100644
index 7fff811..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/internal/jaxws/core/utils/JAXWSUtils.java
+++ /dev/null
@@ -1,134 +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.jaxws.core.utils;
-
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-import com.sun.mirror.declaration.AnnotationMirror;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public final class JAXWSUtils {
-
-    public static final String ACTION = "action";
-    public static final String ARG = "arg"; //$NON-NLS-1$
-    public static final String CLASS_NAME = "className"; //$NON-NLS-1$
-    public static final String DOT_CHARACTER = "."; //$NON-NLS-1$
-    public static final String ENDPOINT_INTERFACE = "endpointInterface"; //$NON-NLS-1$
-    public static final String EXCLUDE = "exclude"; //$NON-NLS-1$
-    public static final String FAULT_BEAN = "faultBean"; //$NON-NLS-1$
-    public static final String FINALIZE = "finalize"; //$NON-NLS-1$
-    public static final String HEADER = "header"; //$NON-NLS-1$
-    public static final String JAXWS_SUBPACKAGE = "jaxws"; //$NON-NLS-1$
-    public static final String LOCAL_NAME = "localName"; //$NON-NLS-1$
-    public static final String MODE = "mode"; //$NON-NLS-1$
-    public static final String NAME = "name"; //$NON-NLS-1$    
-    public static final String OPERATION_NAME = "operationName"; //$NON-NLS-1$
-    public static final String PARAMETER_STYLE = "parameterStyle"; //$NON-NLS-1$
-    public static final String PART_NAME = "partName"; //$NON-NLS-1$
-    public static final String PORT_NAME = "portName"; //$NON-NLS-1$
-    public static final String PORT_SUFFIX = "Port"; //$NON-NLS-1$
-    public static final String RESPONSE = "Response"; //$NON-NLS-1$
-    public static final String RESPONSE_SUFFIX = "Response"; //$NON-NLS-1$
-    public static final String RETURN = "return"; //$NON-NLS-1$
-    public static final String SERVICE_NAME = "serviceName"; //$NON-NLS-1$
-    public static final String SERVICE_SUFFIX = "Service"; //$NON-NLS-1$
-    public static final String STYLE = "style"; //$NON-NLS-1$
-    public static final String TARGET_NAMESPACE = "targetNamespace"; //$NON-NLS-1$
-    public static final String TRUE = "true"; //$NON-NLS-1$
-    public static final String TYPE = "type"; //$NON-NLS-1$
-    public static final String USE = "use"; //$NON-NLS-1$
-    public static final String VALUE = "value"; //$NON-NLS-1$
-
-    private JAXWSUtils() {
-    }
-    
-    public static boolean isDocumentBare(AnnotationMirror mirror) {
-        String style = AnnotationUtils.getStringValue(mirror, STYLE);
-        String use = AnnotationUtils.getStringValue(mirror, USE);
-        String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-
-        return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
-    }
-
-    public static boolean isDocumentBare(IAnnotation annotation) {
-        try {
-            String style = AnnotationUtils.getEnumValue(annotation, STYLE);
-            String use = AnnotationUtils.getEnumValue(annotation, USE);
-            String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-            return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return false;
-    }
-    
-    public static boolean isDocumentBare(org.eclipse.jdt.core.dom.Annotation annotation) {
-        String style = AnnotationUtils.getEnumValue(annotation, STYLE);
-        String use = AnnotationUtils.getEnumValue(annotation, USE);
-        String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-
-        return JAXWSUtils.isDocumentBare(style, use, parameterStyle);
-    }
-
-    public static boolean isDocumentBare(String style, String use, String parameterStyle) {
-        return (style == null || style.equals(Style.DOCUMENT.name()))
-                && (use == null || use.equals(Use.LITERAL.name()))
-                && (parameterStyle != null && parameterStyle.equals(ParameterStyle.BARE.name()));
-    }
-
-    public static boolean isDocumentWrapped(AnnotationMirror mirror) {
-        String style = AnnotationUtils.getStringValue(mirror, STYLE);
-        String use = AnnotationUtils.getStringValue(mirror, USE);
-        String parameterStyle = AnnotationUtils.getStringValue(mirror, PARAMETER_STYLE);
-        
-        return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
-    }
-    
-    public static boolean isDocumentWrapped(IAnnotation annotation) {
-        try {
-            String style = AnnotationUtils.getEnumValue(annotation, STYLE);
-            String use = AnnotationUtils.getEnumValue(annotation, USE);
-            String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-            return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return true;
-    }
-    
-    public static boolean isDocumentWrapped(org.eclipse.jdt.core.dom.Annotation annotation) {
-        String style = AnnotationUtils.getEnumValue(annotation, STYLE);
-        String use = AnnotationUtils.getEnumValue(annotation, USE);
-        String parameterStyle = AnnotationUtils.getEnumValue(annotation, PARAMETER_STYLE);
-
-        return JAXWSUtils.isDocumentWrapped(style, use, parameterStyle);
-    }
-
-    
-    public static boolean isDocumentWrapped(String style, String use, String parameterStyle) {
-        return (style == null || style.equals(Style.DOCUMENT.name()))
-                && (use == null || use.equals(Use.LITERAL.name()))
-                && (parameterStyle == null || parameterStyle.equals(ParameterStyle.WRAPPED.name()));
-    }
-
-    
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java
deleted file mode 100644
index 80c060f..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/JDTUtils.java
+++ /dev/null
@@ -1,358 +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.jaxws.core.utils;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-
-/**
- * JDT Utility class.
- * <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>
- * @author sclarke
- */
-public final class JDTUtils {
-
-    private JDTUtils() {
-    }
-
-    public static void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
-        try {
-            List<IClasspathEntry> currentEntries = Arrays.asList(javaProject.getRawClasspath());
-            List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
-            newEntries.addAll(currentEntries);
-            if (classpathEntry != null && !newEntries.contains(classpathEntry)) {
-                newEntries.add(classpathEntry);
-            }
-            javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[newEntries.size()]),
-                    new NullProgressMonitor());
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-    }
-
-    public static void removeFromClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
-        try {
-            List<IClasspathEntry> currentEntries = Arrays.asList(javaProject.getRawClasspath());
-            List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
-            newEntries.addAll(currentEntries);
-            if (classpathEntry != null && newEntries.contains(classpathEntry)) {
-                newEntries.remove(classpathEntry);
-            }
-            javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[newEntries.size()]),
-                    new NullProgressMonitor());
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-    }
-    
-    public static IStatus checkTypeExists(IType type, String compilationUnitName) {
-        compilationUnitName = compilationUnitName.trim();
-
-        IPackageFragment packageFragment = type.getPackageFragment();
-        ICompilationUnit compilationUnit = packageFragment.getCompilationUnit(compilationUnitName);
-        IResource resource = compilationUnit.getResource();
-
-        if (resource.exists()) {
-            return new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID, JAXWSCoreMessages
-                    .bind(JAXWSCoreMessages.TYPE_WITH_NAME_ALREADY_EXISTS, new Object[] {
-                            compilationUnitName, packageFragment.getElementName() }));
-        }
-        URI location = resource.getLocationURI();
-        if (location != null) {
-            try {
-                IFileStore fileStore = EFS.getStore(location);
-                if (fileStore.fetchInfo().exists()) {
-                    return new Status(IStatus.ERROR, JAXWSCorePlugin.PLUGIN_ID,
-                            JAXWSCoreMessages.TYPE_NAME_DIFFERENT_CASE_EXISTS);
-                }
-            } catch (CoreException ce) {
-                JAXWSCorePlugin.log(ce.getStatus());
-            }
-        }
-        return Status.OK_STATUS;
-    }
-    
-    public static String getClassName(String projectName, String fullyQualifiedClassName) {
-        return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName)
-                .getElementName();
-    }
-
-    public static IJavaProject getJavaProject(IProject project) {
-        IJavaProject javaProject = JavaCore.create(project);
-        return javaProject;
-    }
-
-    public static IJavaProject getJavaProject(String projectName) {
-        IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-        return JDTUtils.getJavaProject(project);
-    }
-
-    public static String getJavaProjectOutputDirectoryPath(IJavaProject javaProject) {
-        IPath outputPath;
-        String fullPath = ""; //$NON-NLS-1$
-        try {
-            outputPath = javaProject.getOutputLocation();
-            fullPath = ResourcesPlugin.getWorkspace().getRoot().findMember(outputPath).getLocation()
-                    .toOSString();
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return fullPath;
-    }
-
-    public static String getJavaProjectOutputDirectoryPath(String projectName) {
-        return JDTUtils.getJavaProjectOutputDirectoryPath(JDTUtils.getJavaProject(projectName));
-    }
-
-    public static String getJavaProjectSourceDirectoryPath(IJavaProject javaProject,
-            String fullyQualifiedClassName) {
-        
-        IType type = JDTUtils.getType(javaProject, fullyQualifiedClassName);
-        IPackageFragment packageFragment = type.getPackageFragment();
-        IPackageFragmentRoot packageFragmentRoot = (IPackageFragmentRoot)packageFragment.getParent();
-        IResource srcDirectoryResource = packageFragmentRoot.getResource();
-        return srcDirectoryResource.getFullPath().toOSString();
-    }
-
-    public static String getJavaProjectSourceDirectoryPath(String projectName, 
-            String fullyQualifiedClassName) {
-        return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(projectName),
-                fullyQualifiedClassName);
-    }
-
-    public static String getJavaProjectSourceDirectoryPath(String projectName) {
-        return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(projectName));
-    }
-
-    public static String getJavaProjectSourceDirectoryPath(IProject project) {
-        return JDTUtils.getJavaProjectSourceDirectoryPath(JDTUtils.getJavaProject(project));
-    }
-    
-    public static String getJavaProjectSourceDirectoryPath(IJavaProject javaProject) {
-        try {
-            IPackageFragmentRoot[] packageFragmentRoots = javaProject.getAllPackageFragmentRoots();
-            IPackageFragmentRoot packageFragmentRoot = packageFragmentRoots[0];
-            IResource srcDirectoryResource = packageFragmentRoot.getResource();
-            return srcDirectoryResource.getFullPath().toOSString();
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    public static String getPackageNameFromClass(IJavaProject javaProject, String fullyQualifiedClassName) {
-        return JDTUtils.getType(javaProject, fullyQualifiedClassName).getPackageFragment().getElementName();
-    }
-
-    public static String getPackageNameFromClass(String projectName, String fullyQualifiedClassName) {
-        return JDTUtils
-                .getPackageNameFromClass(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName);
-    }
-
-    
-    /**
-     * If the given <code>IType</code> is an interface all methods declared in that interface are returned.
-     * <p>
-     * Alternatively if the given given <code>IType</code> is a class only methods that are explicitly marked
-     * public are returned.
-     * 
-     * @param type the type
-     * @return the public methods declared in this type
-     */
-    public static IMethod[] getPublicMethods(IType type) {
-        List<IMethod> publicMethods = new ArrayList<IMethod>();
-        try {
-            IMethod[] allMethods = type.getMethods();
-            if (type.isInterface()) {
-                return allMethods;
-            }
-            for (int i = 0; i < allMethods.length; i++) {
-                IMethod method = allMethods[i];
-                if (Flags.isPublic(method.getFlags()) && !method.isConstructor() && !method.isMainMethod()) {
-                    publicMethods.add(method);
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return publicMethods.toArray(new IMethod[publicMethods.size()]);
-    }
-    
-    public static String getSourceFromType(IType type) {
-        try {
-            return type.getCompilationUnit().getBuffer().getContents();
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    public static String getTargetNamespaceFromPackageName(String packageName) {
-        if (packageName == null || packageName.length() == 0) {
-            return "http://default_package/"; //$NON-NLS-1$
-        }
-        List<String> namespaceElements = Arrays.asList(packageName.split("\\.")); //$NON-NLS-1$
-        Collections.reverse(namespaceElements);
-        String targetNamespace = "http://"; //$NON-NLS-1$
-
-        Iterator<String> namespaceIterator = namespaceElements.iterator();
-        while (namespaceIterator.hasNext()) {
-            String element = namespaceIterator.next();
-            if (element.trim().length() > 0) {
-                targetNamespace += element;
-                if (namespaceIterator.hasNext()) {
-                    targetNamespace += "."; //$NON-NLS-1$
-                }
-            }
-        }
-        targetNamespace += "/"; //$NON-NLS-1$
-        return targetNamespace;
-    }
-
-    public static IType getType(IJavaProject javaProject, String fullyQualifiedClassName) {
-        try {
-            return javaProject.findType(fullyQualifiedClassName);
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return null;
-    }
-
-    public static IType getType(IProject project, String fullyQualifiedClassName) {
-        return JDTUtils.getType(JDTUtils.getJavaProject(project), fullyQualifiedClassName);
-    }
-
-    public static IType getType(String projectName, String fullyQualifiedClassName) {
-        return JDTUtils.getType(JDTUtils.getJavaProject(projectName), fullyQualifiedClassName);
-    }
-
-    public static boolean isJavaProject(IProject project) {
-        try {
-            return project.hasNature(JavaCore.NATURE_ID);
-        } catch (CoreException ce) {
-            JAXWSCorePlugin.log(ce.getStatus());
-        }
-        return false;
-    }
-    
-    public static boolean isPublicMethod(IMethod method) {
-        try {
-            return Flags.isPublic(method.getFlags()) && !method.isConstructor() && !method.isMainMethod();
-        } catch (JavaModelException jme) {
-            JAXWSCorePlugin.log(jme.getStatus());
-        }
-        return false;
-    }
-
-    public static IStatus validateJavaTypeName(String compilationUnitName) {
-        String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
-        String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
-        return JavaConventions.validateJavaTypeName(compilationUnitName, sourceLevel, complianceLevel);
-    }
-
-    public static IStatus validateJavaTypeName(String projectName, String compilationUnitName) {
-        IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-        String sourceLevel = javaProject.getOption(JavaCore.COMPILER_SOURCE, true);
-        String complianceLevel = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
-        return JavaConventions.validateJavaTypeName(compilationUnitName, sourceLevel, complianceLevel);
-    }
-
-    public static IStatus validatePackageName(String projectName, String packageName) {
-        IJavaProject javaProject = JDTUtils.getJavaProject(projectName);
-        String sourceLevel = javaProject.getOption(JavaCore.COMPILER_SOURCE, true);
-        String complianceLevel = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
-        return JavaConventions.validatePackageName(packageName, sourceLevel, complianceLevel);
-    }
-
-    public static IStatus validateIdentifier(String id) {
-        String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
-        String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
-        return JavaConventions.validateIdentifier(id, sourceLevel, complianceLevel);
-    }
-
-	public static ICompilationUnit getCompilationUnitFromFile(IFile file) {
-		IProject project = file.getProject();
-		try {
-			if (project.hasNature(JavaCore.NATURE_ID)) {
-				IJavaProject javaProject = JavaCore.create(project);
-				IPackageFragmentRoot[] packageFragmentRoots = javaProject.getPackageFragmentRoots();
-				for (IPackageFragmentRoot packageFragmentRoot : packageFragmentRoots) {
-					if (packageFragmentRoot.getKind() == IPackageFragmentRoot.K_SOURCE) {
-						IJavaElement[] packageFragments = packageFragmentRoot.getChildren();
-						for (IJavaElement javaElement : packageFragments) {
-							if (javaElement.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
-								IPackageFragment packageFragment = (IPackageFragment)javaElement;
-								ICompilationUnit[] compilationUnits = packageFragment.getCompilationUnits();
-								for (ICompilationUnit compilationUnit : compilationUnits) {
-									if (compilationUnit.getPath().equals(file.getFullPath())) {
-										return compilationUnit;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		} catch (JavaModelException jme) {
-			JAXWSCorePlugin.log(jme.getStatus());
-		} catch (CoreException ce) {
-			JAXWSCorePlugin.log(ce.getStatus());
-		}
-		return null;
-	}
-	
-    public static CompilationUnit getCompilationUnit(ICompilationUnit source) {
-        ASTParser parser = ASTParser.newParser(AST.JLS3);
-        parser.setSource(source);
-        CompilationUnit compilationUnit = (CompilationUnit) parser.createAST(new NullProgressMonitor());
-        compilationUnit.recordModifications();
-        
-        return compilationUnit;
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java b/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java
deleted file mode 100644
index 0f5b934..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.core/src/org/eclipse/jst/ws/jaxws/core/utils/WSDLUtils.java
+++ /dev/null
@@ -1,257 +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.jaxws.core.utils;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.filesystem.URIUtil;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCorePlugin;
-import org.xml.sax.InputSource;
-
-/**
- * WSDL Utility class.
- * <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>
- * @author sclarke
- */
-public final class WSDLUtils {
-    private static final String WSDL_FILE_NAME_PATTERN = "[a-zA-Z0-9_\\-]+.wsdl";//$NON-NLS-1$
-    private static final String WSDL_QUERY = "?wsdl"; //$NON-NLS-1$
-
-	private static final IPath WSDL_FOLDER_PATH = new Path("wsdl/"); //$NON-NLS-1$
-    private static final int TIMEOUT = 30000;
-
-	public static final String WSDL_FILE_EXTENSION = ".wsdl"; //$NON-NLS-1$
-	
-    private WSDLUtils() {
-    }
-        
-    public static Definition readWSDL(URL wsdlURL) throws IOException {
-    	URLConnection urlConnection = wsdlURL.openConnection();
-    	urlConnection.setConnectTimeout(TIMEOUT);
-    	urlConnection.setReadTimeout(TIMEOUT);
-    	InputStream inputStream = null;
-        try {
-            inputStream = urlConnection.getInputStream();
-            InputSource inputSource = new InputSource(inputStream);
-            WSDLFactory wsdlFactory = WSDLFactory.newInstance();
-            WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-            Definition definition = wsdlReader.readWSDL(wsdlURL.getPath(), inputSource);
-            return definition;
-        } catch (WSDLException wsdle) {
-            JAXWSCorePlugin.log(wsdle);
-        } finally {
-            if (inputStream != null) {
-                inputStream.close();
-            }
-        }
-        return null;
-    }
-    
-    public static void writeWSDL(URL wsdlURL, Definition definition) throws IOException, CoreException {
-    	URI wsdlURI = null;
-        OutputStream wsdlOutputStream = null;
-        try {
-        	wsdlURI = wsdlURL.toURI();
-            File wsdlFile = new File(wsdlURI);
-            wsdlOutputStream = new FileOutputStream(wsdlFile);
-            WSDLFactory wsdlFactory = WSDLFactory.newInstance();
-            WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-            wsdlWriter.writeWSDL(definition, wsdlOutputStream);
-        } catch (WSDLException wsdle) {
-        	JAXWSCorePlugin.log(wsdle);
-        } catch (URISyntaxException urise) {
-        	JAXWSCorePlugin.log(urise);
-        } finally {
-            if (wsdlOutputStream != null) {
-                wsdlOutputStream.close();
-                IFile file = ResourcesPlugin.getWorkspace().getRoot()
-						.getFileForLocation(URIUtil.toPath(wsdlURI));
-                if (file != null && file.exists()) {
-                	file.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
-                }
-            }
-        }
-    }
-   
-    public static boolean isValidWSDLFileName(String wsdlFileName) {
-        return wsdlFileName != null && wsdlFileName.matches(WSDL_FILE_NAME_PATTERN);     
-    }
-        
-    public static IProject getProject(String projectName) {
-        return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    }
-        
-    public static IFolder getWebContentFolder(String projectName) {
-    	return WSDLUtils.getWebContentFolder(WSDLUtils.getProject(projectName));
-    }
-    
-    public static IFolder getWebContentFolder(IProject project) {
-		return ResourcesPlugin.getWorkspace().getRoot().getFolder(
-				WSDLUtils.getWebContentPath(project));
-	}
-
-    public static IFolder getWSDLFolder(String projectName) {
-        return WSDLUtils.getWSDLFolder(WSDLUtils.getProject(projectName));
-    }
-
-    public static IFolder getWSDLFolder(IProject project) {
-        IPath wsdlFolderPath = WSDLUtils.getWebContentPath(project).append(WSDLUtils.WSDL_FOLDER_PATH);
-        IFolder wsdlFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(wsdlFolderPath);
-        if (!wsdlFolder.exists()) {
-            try {
-                wsdlFolder.create(true, true, new NullProgressMonitor());
-            } catch (CoreException ce) {
-                JAXWSCorePlugin.log(ce.getStatus());
-            }
-        }
-        return wsdlFolder;
-    }
-    
-    public static IPath getWebContentPath(IProject project) {
-        return J2EEUtils.getWebContentPath(project).addTrailingSeparator();
-    }
-
-    public static String getWSDLFileNameFromURL(URL wsdlURL) {
-        IPath wsdlPath = new Path(wsdlURL.toExternalForm());
-        return wsdlPath.lastSegment();
-    }
-
-    /**
-     * will return one of: 
-     * <li>SOAPAddress<li>SOAP12Address<li>null if it can not find a soap address
-     */
-    @SuppressWarnings("unchecked")
-    public static ExtensibilityElement getEndpointAddress(Definition definition) {
-        if (definition != null) {
-            Map servicesMap = definition.getServices();
-            Set<Map.Entry> servicesSet = servicesMap.entrySet();
-            for (Map.Entry serviceEntry : servicesSet) {
-                Service service = (Service) serviceEntry.getValue();
-                Map portsMap = service.getPorts();
-                Set<Map.Entry> portsSet = portsMap.entrySet();
-                for (Map.Entry portEntry : portsSet) {
-                    Port port = (Port) portEntry.getValue();
-                    List extensibilityElements = port.getExtensibilityElements();
-                    for (Object object : extensibilityElements) {
-                        if (object instanceof SOAPAddress || object instanceof SOAP12Address) {
-                            return (ExtensibilityElement) object;      
-                        }
-                    }
-                 }
-            }
-        }
-        return null;
-    }
-
-    public static String getWSDLLocation(Definition definition) throws MalformedURLException {
-		ExtensibilityElement extensibilityElement = WSDLUtils.getEndpointAddress(definition);
-		if (extensibilityElement != null) {
-	        String locationURI = getLocationURI(extensibilityElement);
-	        if (locationURI.length() > 0) {
-	            URL endpointURL = new URL(locationURI);
-	            if (endpointURL.getQuery() == null) {
-	                locationURI += WSDL_QUERY;
-	            }
-                return locationURI;
-	        }
-		}
-	    return null;
-    }
-    
-    private static String getLocationURI(ExtensibilityElement extensibilityElement) {
-	    if (extensibilityElement instanceof SOAPAddress) {
-            return ((SOAPAddress) extensibilityElement).getLocationURI();
-        }
-        if (extensibilityElement instanceof SOAP12Address) {
-            return ((SOAP12Address) extensibilityElement).getLocationURI();
-        }
-		return "";
-    }
-    
-    public static String getPackageNameFromNamespace(String namespace) {
-        String packageName = ""; //$NON-NLS-1$
-        try {
-            List<String> packageNameElements = new ArrayList<String>();
-
-            URL namespaceURL = new URL(namespace);
-
-            // Remove www if there
-            String authority = namespaceURL.getAuthority();
-            if (authority.indexOf("www") != -1) { //$NON-NLS-1$
-                authority = authority.substring(authority.indexOf(".") + 1, authority.length()); //$NON-NLS-1$
-            }
-
-            List<String> authorityElements = Arrays.asList(authority.split("\\.")); //$NON-NLS-1$
-            Collections.reverse(authorityElements);
-            packageNameElements.addAll(authorityElements);
-
-            String path = namespaceURL.getPath();
-            List<String> pathElements = Arrays.asList(path.split("[/\\\\]")); //$NON-NLS-1$
-            packageNameElements.addAll(pathElements);
-
-            Iterator<String> packageIterator = packageNameElements.iterator();
-            while (packageIterator.hasNext()) {
-                String element = packageIterator.next();
-                if (element.trim().length() > 0) {
-                    packageName += element;
-                    if (packageIterator.hasNext()) {
-                        packageName += "."; //$NON-NLS-1$
-                    }
-                }
-            }
-        } catch (MalformedURLException murle) {
-            JAXWSCorePlugin.log(murle);
-        }
-        return packageName.toLowerCase();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath b/bundles/org.eclipse.jst.ws.jaxws.ui/.classpath
deleted file mode 100755
index 2d1a430..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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.jaxws.ui/.project b/bundles/org.eclipse.jst.ws.jaxws.ui/.project
deleted file mode 100755
index e5a0fde..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws.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.jaxws.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index f6eebfa..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Dec 18 11:00:26 GMT 2008

-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.jaxws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index 97216a9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.ui;singleton:=true
-Bundle-Version: 0.5.2.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin
-Bundle-Vendor: %pluginProvider
-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.jdt.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.command.env;bundle-version="[1.0.305,1.1.0)",
- org.eclipse.wst.command.env.core;bundle-version="[1.0.204,1.1.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/about.html b/bundles/org.eclipse.jst.ws.jaxws.ui/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.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>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.jaxws.ui/build.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
deleted file mode 100755
index d4e6333..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = plugin.xml,\

-               META-INF/,\

-               .,\

-               icons/,\

-               about.html,\

-               plugin.properties

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
deleted file mode 100644
index a4c9e60..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/elcl16/filter_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
deleted file mode 100755
index 435d62e..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/annotation_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
deleted file mode 100644
index d11c996..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/eview16/prop_ps.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/false.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif b/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/icons/obj16/true.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
deleted file mode 100644
index bb1201b..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-
-#properties file for JAXWS UI
-pluginName=JAX-WS Tools UI (Incubation)
-pluginProvider=Eclipse Web Tools Platform
-
-ANNOTATIONS_VIEW_CATEGORY_NAME=JAX-WS
-ANNOTATIONS_VIEW_NAME=Annotation Properties
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
deleted file mode 100755
index 40794f7..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-   <extension point="org.eclipse.ui.views">

-      <category

-            name="%ANNOTATIONS_VIEW_CATEGORY_NAME"

-            id="org.eclipse.jst.ws.jwst.ui">

-      </category>

-      <view

-            name="%ANNOTATIONS_VIEW_NAME"

-            icon="icons/eview16/prop_ps.gif"

-            category="org.eclipse.jst.ws.jwst.ui"

-            class="org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView"

-            id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">

-      </view>

-   </extension>

-   

- <!--  <extension point="org.eclipse.ui.perspectiveExtensions">

-      <perspectiveExtension targetID="org.eclipse.jdt.ui.JavaPerspective">

-         <view

-               relative="org.eclipse.ui.views.ProblemView"

-               relationship="stack"

-               id="org.eclipse.jst.ws.jaxws.ui.views.AnnotationsView">

-         </view>

-      </perspectiveExtension>

-   </extension> -->

-  

-   <extension id="jaxwsProposalComputer"

-         name="JAX-WS Proposals"

-         point="org.eclipse.jdt.ui.javaCompletionProposalComputer">

-      <proposalCategory

-            icon="icons/eview16/annotation_obj.gif">

-      </proposalCategory>

-   </extension>

-

-   <extension id="JAXWSJavaCompletionProposalComputer"

-         point="org.eclipse.jdt.ui.javaCompletionProposalComputer">

-      <javaCompletionProposalComputer

-            activate="true"

-            categoryId="org.eclipse.jst.ws.jaxws.ui.jaxwsProposalComputer"

-            class="org.eclipse.jst.ws.internal.jaxws.ui.annotations.contentassist.AnnotationCompletionProposalComputer">

-         <!--<partition

-               type="__dftl_partition_content_type">

-         </partition> -->

-         <partition

-               type="__java_string">

-         </partition>

-      </javaCompletionProposalComputer>

-   </extension>

-</plugin>

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
deleted file mode 100755
index 85e0974..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.java
+++ /dev/null
@@ -1,51 +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.jaxws.ui;

-

-import org.eclipse.osgi.util.NLS;

-

-/**

- * @author sclarke

- */

-public class JAXWSUIMessages extends NLS {

-    private static final String BUNDLE_NAME = "org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages"; //$NON-NLS-1$

-    

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL;

-    public static String ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED;

-    

-    public static String ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX;

-

-    public static String ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME;

-    public static String ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION;

-    public static String ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME;

-

-    public static String ANNOTATIONS_VIEW_FILTER_ACTION_NAME;

-    public static String ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE;

-

-    public static String ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND;

-    public static String ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE;

-    

-    public static String CONFIGURE_JAVA_1_6_LIBRARY;

-    

-    static {

-        // initialize resource bundle

-        NLS.initializeMessages(BUNDLE_NAME, JAXWSUIMessages.class);

-    }

-

-    private JAXWSUIMessages() {

-    }

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
deleted file mode 100644
index 0a8f77d..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIMessages.properties
+++ /dev/null
@@ -1,32 +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
-###############################################################################
-ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL=Add
-ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL=Browse...
-ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL=Down
-ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE=Edit Array Values
-ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL=Remove
-ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE=Select Class
-ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL=Up
-ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED=Nested Arrays within Arrays not yet supported
-ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX=Not a valid 
-
-ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION=Annotations not available for current selection
-ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME=Values
-ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME=Annotations
-
-ANNOTATIONS_VIEW_FILTER_ACTION_NAME=Filters...
-ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE=Select Annotation Categories to Filter
-
-ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND=No suitable {0} library can be found on the projects classpath.\n\n
-
-ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE=\n(For use with non JAX-WS libraries please setup the project with the required libraries.)\n\n
-
-CONFIGURE_JAVA_1_6_LIBRARY=To select a 1.6 or above compliant JRE configure the <a href="1" >Installed JREs</a> or change the JRE on the <a href="2" >Java build path</a>.
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
deleted file mode 100755
index cc61dc9..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/JAXWSUIPlugin.java
+++ /dev/null
@@ -1,86 +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.jaxws.ui;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class JAXWSUIPlugin extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.jaxws.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static JAXWSUIPlugin plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public JAXWSUIPlugin() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static JAXWSUIPlugin getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns an image descriptor for the image file at the given

-	 * plug-in relative path

-	 *

-	 * @param path the path

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String path) {

-		return imageDescriptorFromPlugin(PLUGIN_ID, path);

-	}

-	

-    public static void logMessage(int severity, String message) {

-        JAXWSUIPlugin.log(new Status(severity, JAXWSUIPlugin.PLUGIN_ID, message));

-    }

-

-    public static void log(IStatus status) {

-        JAXWSUIPlugin.getDefault().getLog().log(status);

-    }

-

-    public static void log(Throwable exception) {

-        JAXWSUIPlugin.log(new Status(IStatus.ERROR, JAXWSUIPlugin.PLUGIN_ID, 

-        		exception.toString(), exception));

-    }

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
deleted file mode 100644
index 600fdc6..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/actions/AnnotationsViewFilterAction.java
+++ /dev/null
@@ -1,96 +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.jaxws.ui.actions;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsView;
-import org.eclipse.jst.ws.internal.jaxws.ui.views.AnnotationsViewCategoryFilter;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.dialogs.ListSelectionDialog;
-
-/**
- * @author sclarke
- *
- */
-public class AnnotationsViewFilterAction extends Action {
-    private StructuredViewer viewer;
-    private AnnotationsViewCategoryFilter categoryFilter;
-    
-    public AnnotationsViewFilterAction(AnnotationsView annotationsView, StructuredViewer viewer, String text) {
-        super(text);
-        this.viewer = viewer;
-        this.setImageDescriptor(JAXWSUIPlugin.getImageDescriptor("icons/elcl16/filter_ps.gif")); //$NON-NLS-1$
-        categoryFilter = new AnnotationsViewCategoryFilter(annotationsView, viewer);
-    }
-
-    @Override
-    public void run() {
-        ListSelectionDialog listSelectionDialog = new ListSelectionDialog(viewer.getControl().getShell(),
-                AnnotationsManager.getAnnotationCategories(), new AnnotationsCategoryDialogContentProvider(),
-                new AnnotationsCategoryDialogLabelProvider(), 
-                JAXWSUIMessages.ANNOTATIONS_VIEW_FILTER_ACTION_SELECT_CATEGORIES_MESSAGE);
-        
-        listSelectionDialog.setInitialElementSelections(categoryFilter.getCategories());
-        
-        int returnValue = listSelectionDialog.open();
-        if (returnValue == Window.OK) {
-            Object[] result = listSelectionDialog.getResult();
-            categoryFilter.filterAnnotations(Arrays.asList(result));
-        }
-    }
-    
-    public void init(IMemento memento) {
-        categoryFilter.init(memento);
-    }
-    
-    public void saveState(IMemento memento) {
-        categoryFilter.saveState(memento);
-    }
-    
-    private static class AnnotationsCategoryDialogContentProvider implements IStructuredContentProvider {
-
-        public Object[] getElements(Object inputElement) {
-            if (inputElement instanceof List) {
-                return ((List<String>)inputElement).toArray();
-            }
-            return new Object[] {};
-        }
-
-        public void dispose() {
-        }
-
-        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-        }
-        
-    }
-    
-    private static class AnnotationsCategoryDialogLabelProvider extends LabelProvider {
-        public String getText(Object element) {
-            return element.toString();
-        }
-
-        public Image getImage(Object element) {
-            return null;
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
deleted file mode 100644
index bd38608..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/annotations/contentassist/AnnotationCompletionProposalComputer.java
+++ /dev/null
@@ -1,192 +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.jaxws.ui.annotations.contentassist;

-

-import java.util.Collections;

-import java.util.List;

-

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.jdt.core.CompletionContext;

-import org.eclipse.jdt.core.ICompilationUnit;

-import org.eclipse.jdt.core.IJavaElement;

-import org.eclipse.jdt.core.IMethod;

-import org.eclipse.jdt.core.JavaModelException;

-import org.eclipse.jdt.core.dom.ASTNode;

-import org.eclipse.jdt.core.dom.Annotation;

-import org.eclipse.jdt.core.dom.CompilationUnit;

-import org.eclipse.jdt.core.dom.Expression;

-import org.eclipse.jdt.core.dom.IExtendedModifier;

-import org.eclipse.jdt.core.dom.MemberValuePair;

-import org.eclipse.jdt.core.dom.NormalAnnotation;

-import org.eclipse.jdt.core.dom.PackageDeclaration;

-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;

-import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;

-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;

-import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext;

-import org.eclipse.jface.text.contentassist.ICompletionProposal;

-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;

-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;

-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;

-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;

-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;

-

-/**

- * 

- * @author sclarke

- *

- */

-public class AnnotationCompletionProposalComputer implements IJavaCompletionProposalComputer {

-

-	public AnnotationCompletionProposalComputer() {

-		super();

-	}

-

-	@SuppressWarnings("unchecked")

-	public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {

-	    if (context instanceof JavaContentAssistInvocationContext) {

-	        return computeCompletionProposals((JavaContentAssistInvocationContext) context);

-	    }

- 	    return Collections.emptyList();

-	}

-

-	@SuppressWarnings("unchecked")

-	private List<ICompletionProposal> computeCompletionProposals(JavaContentAssistInvocationContext context) {

-        CompletionContext completionContext = context.getCoreContext();

-        int tokenStart = completionContext.getOffset();

-	    

-	    ICompilationUnit source = context.getCompilationUnit();

-		try {

-			IJavaElement javaElement = source.getElementAt(tokenStart);

-			if (javaElement != null) {

-		        

-			    CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);

-			    int elementType = javaElement.getElementType();

-			    

-                if (elementType == IJavaElement.PACKAGE_DECLARATION) {

-                    PackageDeclaration packageDeclaration = compilationUnit.getPackage();

-                    List<Annotation> packageAnnotations = packageDeclaration.annotations();

-                    for (Annotation annotation : packageAnnotations) {

-                        if (annotation instanceof NormalAnnotation) {

-                            NormalAnnotation normalAnnotation = (NormalAnnotation) annotation;

-                            MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation,

-                                    tokenStart);

-                            if (memberValuePair != null) {

-                                return getCompletionProposalsForASTNode(normalAnnotation, memberValuePair,

-                                        packageDeclaration);                            

-                            }

-                        }

-                    }

-                }

-                if (elementType == IJavaElement.TYPE || elementType == IJavaElement.FIELD) {

-			        return getCompletionProposalsForJavaElement(AnnotationUtils.getExtendedModifiers(

-			                compilationUnit, javaElement), javaElement, tokenStart);

-                }

-                

-                if (elementType == IJavaElement.METHOD) {

-                    SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit,

-                            (IMethod)javaElement, tokenStart);

-                    if (parameter != null) {

-                        return getCompletionProposalsForASTNode(parameter.modifiers(), parameter, tokenStart);

-                    } else {

-                        return getCompletionProposalsForJavaElement(AnnotationUtils.getExtendedModifiers(

-                                compilationUnit, javaElement), javaElement, tokenStart);

-                    }

-                }

-			}

-		} catch (JavaModelException jme) {

-		    JAXWSUIPlugin.log(jme.getStatus());

-		}

-		return Collections.emptyList();

-	}

-	

-	private List<ICompletionProposal> getCompletionProposalsForASTNode(List<IExtendedModifier> modifiers,

-	        ASTNode astNode, int offset) {

-        for (IExtendedModifier extendedModifier : modifiers) {

-            if (extendedModifier.isAnnotation() && extendedModifier instanceof NormalAnnotation) {

-                NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;

-                MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);

-                if(memberValuePair != null) {

-                    return getCompletionProposalsForASTNode(normalAnnotation, memberValuePair,

-                            astNode);

-                }

-            }

-        }

-	    return Collections.emptyList();

-	}

-

-	private List<ICompletionProposal> getCompletionProposalsForJavaElement(List<IExtendedModifier> modifiers,

-	        IJavaElement javaElement, int offset) {

-        for (IExtendedModifier extendedModifier : modifiers) {

-            if (extendedModifier.isAnnotation() && extendedModifier instanceof NormalAnnotation) {

-                NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;

-                MemberValuePair memberValuePair = getMemberValuePairForPosition(normalAnnotation, offset);

-                if(memberValuePair != null) {

-                    return getCompletionProposalsForJavaElement(normalAnnotation, memberValuePair, 

-                            javaElement);

-                }

-            }

-        }

-        return Collections.emptyList();

-    }

-	

-	private List<ICompletionProposal> getCompletionProposalsForASTNode(NormalAnnotation normalAnnotation,

-	        MemberValuePair memberValuePair, ASTNode astNode) {

-	    IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager

-                .getAnnotationAttributeInitializerForName(normalAnnotation.getTypeName());

-	    if (annotationAttributeInitializer != null) {

-	        return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(astNode,

-	                memberValuePair);

-	    }

-        return Collections.emptyList();

-	}

-	

-	private List<ICompletionProposal> getCompletionProposalsForJavaElement(NormalAnnotation normalAnnotation,

-	        MemberValuePair memberValuePair, IJavaElement javaElement) {

-        IAnnotationAttributeInitializer annotationAttributeInitializer = AnnotationsManager

-                .getAnnotationAttributeInitializerForName(normalAnnotation.getTypeName());

-        if (annotationAttributeInitializer != null) {

-            return annotationAttributeInitializer.getCompletionProposalsForMemberValuePair(javaElement,

-                    memberValuePair);

-        }

-        return Collections.emptyList();

-    }

-

-	@SuppressWarnings("unchecked")

-	private MemberValuePair getMemberValuePairForPosition(NormalAnnotation normalAnnotation, int offset) {

-        List<MemberValuePair> memberValuePairs = normalAnnotation.values();

-        for (MemberValuePair memberValuePair : memberValuePairs) {

-            Expression value = memberValuePair.getValue();

-            int valueStartPosition = value.getStartPosition();

-            int valueLength = value.getLength();

-            if (offset >= valueStartPosition

-                    && offset <= valueStartPosition + valueLength) {

-                return memberValuePair;

-            }

-        }

-        return null;

-	}

-	

-	@SuppressWarnings("unchecked")

-	public List computeContextInformation(ContentAssistInvocationContext context, IProgressMonitor monitor) {

-		return Collections.emptyList();

-	}

-

-	public String getErrorMessage() {

-		return null;

-	}

-

-	public void sessionEnded() {

-	}

-

-	public void sessionStarted() {

-	}

-

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
deleted file mode 100644
index f1ea156..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationArrayCellEditor.java
+++ /dev/null
@@ -1,552 +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.jaxws.ui.views;
-
-/**
- * @author sclarke
- */
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-
-public class AnnotationArrayCellEditor extends DialogCellEditor {
-    private Method method;
-    private Object[] values;
-
-    private List<Object> originalValues;
-    private List<Object> updatedValues;
-
-    private  AnnotationArrayDialog annotationArrayDialog;
-    
-    boolean cancelled;
-    
-    public AnnotationArrayCellEditor(Composite parent, Object[] values) {
-        super(parent, SWT.NONE);
-        this.values = values.clone();
-    }
-
-    @Override
-    protected Object openDialogBox(Control cellEditorWindow) {
-        annotationArrayDialog = new AnnotationArrayDialog(cellEditorWindow.getShell(), values);
-        int returnValue = annotationArrayDialog.open();
-        
-        if (returnValue == Window.OK) {
-            cancelled = false;
-            return annotationArrayDialog.getResult();
-        } if (returnValue == Window.CANCEL) {
-            cancelled = true;
-        }
-        return values;
-    }
-    
-    public void setMethod(Method method) {
-        this.method = method;
-    }
-    
-    @Override
-    protected void updateContents(Object value) {
-        if (value instanceof Object[]) {
-            Object[] values = (Object[])value;
-            if (values.length > 0) {
-                getDefaultLabel().setText("[]{...}");     //$NON-NLS-1$
-            } else {
-                getDefaultLabel().setText("[]{}"); //$NON-NLS-1$
-            }
-        }
-    }
-
-    @Override
-    protected Object doGetValue() {
-        if (cancelled || updatedValues == null) {
-            return originalValues != null ? originalValues.toArray() : new Object[0];
-        }
-        return updatedValues.toArray();
-    }
-
-    @Override
-    protected void doSetValue(Object value) {
-        super.doSetValue(value);
-        this.values = (Object[])value;
-    }
-
-    private class AnnotationArrayDialog extends SelectionStatusDialog {
-        private Button addButton;
-        private Button removeButton;
-        private Button upButton;
-        private Button downButton;
-        private Table arrayValuesTable;
-        private TableViewer arrayValuesTableViewer;
-        
-        private Map<String, Control> controls = new HashMap<String, Control>();
-                
-        public AnnotationArrayDialog(Shell parent, Object[] values) {
-            super(parent);
-            setValues(values);
-            setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_EDIT_ARRAY_VALUES_TITLE);
-        }
-
-        private void setValues(Object[] values) {
-            try {
-                originalValues = new ArrayList<Object>();
-                updatedValues = new ArrayList<Object>();
-                for (Object value : values) {
-                    if (value instanceof IAnnotation) {
-                        IAnnotation annotation = (IAnnotation)value;
-                        IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-                        if (memberValuePairs.length > 0) {
-                            List<Map<String, Object>> aList = new ArrayList<Map<String,Object>>();
-                            for (IMemberValuePair memberValuePair : memberValuePairs) {
-                                String memberName = memberValuePair.getMemberName();
-                                Object memberValue = memberValuePair.getValue();
-                                Map<String, Object> mvps = new HashMap<String, Object>();
-                                if (memberValuePair.getValueKind() == IMemberValuePair.K_STRING) {
-                                    mvps.put(memberName, memberValue);
-                                }
-
-                                if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
-                                    mvps.put(memberName, memberValuePair.getValue() + ".class"); //$NON-NLS-1$
-                                }
-                                aList.add(mvps);
-                            }
-                            originalValues.add(aList);
-                            updatedValues.add(aList);
-                        }
-                    }
-                    if (value.equals(Class.class)) {
-                        originalValues.add(value);
-                        updatedValues.add(value);                        
-                    }
-                    if (value instanceof String) {
-                        String string = (String)value;
-                        originalValues.add(string);
-                        updatedValues.add(string);
-                    }
-                }
-            } catch (JavaModelException jme) {
-                JAXWSUIPlugin.log(jme.getStatus());
-            }
-        }
-        
-        @Override
-        protected Control createDialogArea(Composite parent) {
-            Composite mainComposite = (Composite) super.createDialogArea(parent);
-            
-            GridLayout gridLayout = new GridLayout(3, false);
-            mainComposite.setLayout(gridLayout);
-
-            GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, false, false);
-            gridData.widthHint = 800;
-            mainComposite.setLayoutData(gridData);
-            
-            Composite typeComposite = new Composite(mainComposite, SWT.NONE);
-            gridLayout = new GridLayout(3, false);
-            typeComposite.setLayout(gridLayout);
-            gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, true);
-            typeComposite.setLayoutData(gridData);
-            
-            final Class<?> componentType = method.getReturnType().getComponentType();
-            if (componentType.isAnnotation()) {
-                Label compontTypeLabel = new Label(typeComposite, SWT.NONE);
-                compontTypeLabel.setText("@" + componentType.getName()); //$NON-NLS-1$
-                gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-                gridData.horizontalSpan = 3;
-                compontTypeLabel.setLayoutData(gridData);
-
-                Method[] methods = componentType.getDeclaredMethods();
-                for (Method method : methods) {
-                    Label label = new Label(typeComposite, SWT.NONE);
-                    label.setText(method.getName() + ":"); //$NON-NLS-1$
-                    createEntryFields(method, typeComposite);
-                }
-            } else {
-                Label label = new Label(typeComposite, SWT.NONE);
-                label.setText(componentType.getSimpleName());
-                createEntryFields(method, typeComposite);
-            }
-
-            Composite buttonComposite = new Composite(mainComposite, SWT.NONE);
-            gridLayout = new GridLayout(1, false);
-            buttonComposite.setLayout(gridLayout);
-            
-            addButton = new Button(buttonComposite, SWT.PUSH);
-            addButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_ADD_LABEL);
-            addButton.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent event) {
-                    Set<Entry<String, Control>> entrySet = controls.entrySet();
-                    Iterator<Map.Entry<String, Control>> iterator = entrySet.iterator();
-                    List<Map<String, Object>> aList = new ArrayList<Map<String,Object>>();
-                    while (iterator.hasNext()) {
-                        Map.Entry<String, Control> entry = iterator.next();
-                        if (entry.getValue() instanceof Text) {
-                            Text textField = (Text) entry.getValue();
-                            Method method = (Method) textField.getData();
-                            if (textField.getText().trim().length() > 0) {
-                                if (componentType.isAnnotation()) {
-                                    Map<String, Object> memberValuePairs = new HashMap<String, Object>();
-                                    memberValuePairs.put(method.getName(), textField.getText());
-                                    aList.add(memberValuePairs);
-                                } else {
-                                    updatedValues.add(textField.getText());
-                                }
-                            }
-                        }
-                        if (entry.getValue() instanceof Button) {
-                            Button button = (Button)entry.getValue();
-                         //   if (button..getStyle() == SWT.CHECK) {
-                                Method method = (Method) button.getData();
-                                if (componentType.isAnnotation()) {
-                                    Map<String, Object> memberValuePairs = new HashMap<String, Object>();
-                                    memberValuePairs.put(method.getName(), button.getSelection());
-                                    aList.add(memberValuePairs);
-                                } else {
-                                    updatedValues.add(button.getSelection());
-                                }
-                        //    }
-                        }
-                        
-                    }
-                    if (aList.size() > 0) {
-                        updatedValues.add(aList);
-                    }
-                    arrayValuesTableViewer.refresh();
-                }
-            });
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-            addButton.setLayoutData(gridData);
-            
-            removeButton = new Button(buttonComposite, SWT.PUSH);
-            removeButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_REMOVE_LABEL);
-            removeButton.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent event) {
-                    ISelection selection = arrayValuesTableViewer.getSelection();
-                    if (selection != null && !selection.isEmpty()) {
-                        int index = arrayValuesTable.getSelectionIndex();
-                        updatedValues.remove(index);
-                        arrayValuesTableViewer.refresh();
-                    }
-                }
-            });
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-            removeButton.setLayoutData(gridData);
-            
-            upButton = new Button(buttonComposite, SWT.PUSH);
-            upButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_UP_LABEL);
-            upButton.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    moveSelectedElememtUp(getSelectedElement(), getTableViewer());
-                 }
-            });
-            
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-            upButton.setLayoutData(gridData);
-            
-            downButton = new Button(buttonComposite, SWT.PUSH);
-            downButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_DOWN_LABEL);
-            downButton.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    moveSelectedElememtDown(getSelectedElement(), getTableViewer());
-                }
-            });
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-            downButton.setLayoutData(gridData);
-            
-            Composite valuesComposite = new Composite(mainComposite, SWT.NONE);
-            gridLayout = new GridLayout(1, false);
-            valuesComposite.setLayout(gridLayout);
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-            gridData.widthHint = 200;
-            valuesComposite.setLayoutData(gridData);
-            
-            Label valuesLabel = new Label(valuesComposite, SWT.NONE);
-            valuesLabel.setText(method.getName() + ":"); //$NON-NLS-1$
-            
-            arrayValuesTableViewer = new TableViewer(valuesComposite, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL 
-                    | SWT.H_SCROLL);
-            arrayValuesTableViewer.setLabelProvider(new LabelProvider() {
-                @Override
-                public String getText(Object element) {
-                    if (element instanceof List<?>) {
-                        String annotationName = method.getReturnType().getComponentType().getSimpleName();
-                        annotationName += "("; //$NON-NLS-1$
-                        List<Map<String, Object>> valuesList = (List<Map<String, Object>>)element;
-                        Iterator<Map<String, Object>> valuesIterator = valuesList.iterator();
-                        while (valuesIterator.hasNext()) {
-                            Map<String, Object> valuesMap = (Map<String, Object>)valuesIterator.next();
-                            Set<Entry<String, Object>> entrySet = valuesMap.entrySet();
-                            Iterator<Map.Entry<String, Object>> iterator = entrySet.iterator();
-                            while (iterator.hasNext()) {
-                                Map.Entry<String, Object> entry = iterator.next();
-                                Object value = entry.getValue();
-                                boolean isString = (value instanceof String && !value.toString().
-                                        endsWith(".class")); //$NON-NLS-1$
-                                if (isString) {
-                                    annotationName += entry.getKey() + "=\"" + value + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-                                } else {
-                                    annotationName += entry.getKey() + "=" + value; //$NON-NLS-1$
-                                }
-                            }
-                            if (valuesIterator.hasNext()) {
-                                annotationName += ", "; //$NON-NLS-1$
-                            }
-                        }
-                        return annotationName += ")"; //$NON-NLS-1$
-                    }
-                    return element.toString();
-                }
-
-                @Override
-                public Image getImage(Object element) {
-                    Class<?> returnType = method.getReturnType();
-                    if (returnType.getComponentType().isAnnotation()) {
-                        return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);
-                    } if (returnType.equals(Class.class)) {
-                        return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-                    } else {
-                        return PlatformUI.getWorkbench().getSharedImages().getImage(
-                                org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);
-                    }
-                }
-            });
-            
-            arrayValuesTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-                public void selectionChanged(SelectionChangedEvent event) {
-                    int index = arrayValuesTable.getSelectionIndex();
-                    int itemCount = arrayValuesTable.getItemCount();
-                    
-                    if (index == 0 && itemCount <= 1) {
-                        upButton.setEnabled(false);
-                        downButton.setEnabled(false);
-                    }
-                    
-                    if (index == 0 && itemCount > 1) {
-                        upButton.setEnabled(false);
-                        downButton.setEnabled(true);
-                    }
-                    
-                    if (index > 0 && index < itemCount - 1) {
-                        upButton.setEnabled(true);
-                        downButton.setEnabled(true);
-                    }
-                    
-                    if (index > 0 && index == itemCount - 1) {
-                        upButton.setEnabled(true);
-                        downButton.setEnabled(false);
-                    }
-                    
-                    if (index != -1) {
-                        removeButton.setEnabled(true);
-                    } else {
-                        removeButton.setEnabled(false);
-                    }
-                }                
-            });
-            
-            arrayValuesTableViewer.setContentProvider(new ArrayValuesContentProvider());
-
-            arrayValuesTable = arrayValuesTableViewer.getTable();
-            gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-            arrayValuesTable.setLayoutData(gridData);
-
-            arrayValuesTableViewer.setInput(values);
-
-            upButton.setEnabled(false);
-            downButton.setEnabled(false);
-            removeButton.setEnabled(false);
-
-            return mainComposite;
-        }
-        
-        public void createEntryFields(Method method, Composite typeComposite) {
-           //TODO Handle ENUMS 
-            Class<?> returnType = method.getReturnType();
-            Object defaultValue = method.getDefaultValue();
-            GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-            if (returnType.equals(String.class)) {
-                Text text = new Text(typeComposite, SWT.BORDER);
-                text.setData(method);
-                gridData.horizontalSpan = 2;
-                text.setLayoutData(gridData);
-                if (defaultValue != null) {
-                    text.setText(defaultValue.toString());
-                }
-                controls.put(method.getName(), text);
-            }
-            if (returnType.equals(Class.class)) {
-                final Text text = new Text(typeComposite, SWT.BORDER);
-                text.setData(method);
-                gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-                text.setLayoutData(gridData);
-                if (defaultValue != null) {
-                    Class<?> classValue = (Class<?>)defaultValue;
-                    text.setText(classValue.getCanonicalName() + ".class");    
-                }
-                Button browseClassButton = new Button(typeComposite, SWT.PUSH);
-                browseClassButton.setText(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_BROWSE_LABEL);
-                browseClassButton.addSelectionListener(new SelectionAdapter() {
-                    @Override
-                    public void widgetSelected(SelectionEvent e) {
-                        SelectionDialog dialog = getClassSelectionDialog();
-                        dialog.setTitle(JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_SELECT_CLASS_TITLE);
-                        if (dialog.open() == IDialogConstants.OK_ID) {
-                            Object[] types = dialog.getResult();
-                            
-                            if (types != null && types.length > 0) {
-                                IType type = (IType)types[0];
-                                if (type.isBinary()) {
-                                    text.setText(type.getClassFile().getElementName());
-                                }
-                            }
-                        }
-                    }
-                });
-                controls.put(method.getName(), text);
-            }
-            if (returnType.isArray()) {
-                Label notSupportLabel = new Label(typeComposite, SWT.NONE);
-                notSupportLabel.setText(
-                        JAXWSUIMessages.ANNOTATION_ARRAY_CELL_EDITOR_NESTED_ARRAYS_NOT_SUPPORTED);
-                gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-                gridData.horizontalSpan = 2;
-                notSupportLabel.setLayoutData(gridData);
-            }
-            if (returnType.equals(Boolean.TYPE)) {
-                Button checkbox = new Button(typeComposite, SWT.CHECK);
-                checkbox.setData(method);
-                gridData.horizontalSpan = 2;
-                checkbox.setLayoutData(gridData);
-                if (defaultValue != null) {
-                    checkbox.setSelection((Boolean)defaultValue);
-                }
-                controls.put(method.getName(), checkbox);
-            }
-        }
-        
-        public Object getSelectedElement() {
-            IStructuredSelection selection= (IStructuredSelection) arrayValuesTableViewer.getSelection();
-            return selection.getFirstElement();
-        }
-        
-        private TableViewer getTableViewer() {
-            return arrayValuesTableViewer;
-        }
-        
-        public void moveSelectedElememtUp(Object selected, TableViewer tableViewer) {
-            int selectionIndex = tableViewer.getTable().getSelectionIndex();
-            if (selectionIndex > 0) {
-                updatedValues.remove(selected);
-                updatedValues.add(selectionIndex - 1, selected);
-                
-                tableViewer.refresh();
-                tableViewer.reveal(selected);
-                tableViewer.setSelection(new StructuredSelection(selected));
-            }
-        }
-        
-        public void moveSelectedElememtDown(Object selected, TableViewer tableViewer) {
-            int selectionIndex = tableViewer.getTable().getSelectionIndex();
-            int itemCount = tableViewer.getTable().getItemCount();
-            if (selectionIndex < itemCount - 1) {
-                updatedValues.remove(selected);
-                updatedValues.add(selectionIndex + 1, selected);
-                
-                tableViewer.refresh();
-                tableViewer.reveal(selected);
-                tableViewer.setSelection(new StructuredSelection(selected));
-            }
-        }
-
-        private class ArrayValuesContentProvider implements IStructuredContentProvider {
-            
-            public ArrayValuesContentProvider() {
-            }
-            
-            public Object[] getElements(Object inputElement) {
-                return updatedValues.toArray();
-            }
-
-            public void dispose() {
-            }
-
-            public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-            }            
-        }
-        
-        public SelectionDialog getClassSelectionDialog() {
-            try {
-                return JavaUI.createTypeDialog(getShell(), PlatformUI.getWorkbench().getProgressService(), 
-                        SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES, 
-                        false, "* "); //$NON-NLS-1$
-            } catch (JavaModelException jme) {
-                JAXWSUIPlugin.log(jme.getStatus());
-            }
-            return null;
-        }
-        
-        
-        @Override
-        public Object[] getResult() {
-            return updatedValues.toArray();
-        }
-
-        @Override
-        protected void computeResult() {
-        }
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
deleted file mode 100755
index f46f649..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsColumnLabelProvider.java
+++ /dev/null
@@ -1,51 +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.jaxws.ui.views;

-

-import java.lang.reflect.Method;

-

-import org.eclipse.jdt.ui.ISharedImages;

-import org.eclipse.jdt.ui.JavaUI;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.ui.PlatformUI;

-

-/**

- * 

- * @author sclarke

- *

- */

-public class AnnotationsColumnLabelProvider extends ColumnLabelProvider {

-

-    @Override

-    public String getText(Object element) {

-        if (element instanceof Class) {

-            return ((Class<?>)element).getName();

-        }

-        

-        if (element instanceof Method) {

-            return ((Method)element).getName();

-        }

-        return ""; //$NON-NLS-1$

-    }

-

-    @Override

-    public Image getImage(Object element) {

-        if (element instanceof Class) {

-            return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_ANNOTATION);

-        }

-        if (element instanceof Method) {

-            return PlatformUI.getWorkbench().getSharedImages().getImage(

-                    org.eclipse.ui.ISharedImages.IMG_OBJ_FILE);

-        }

-        return null;

-    }

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
deleted file mode 100644
index 2dde0eb..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesColumnLabelProvider.java
+++ /dev/null
@@ -1,283 +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.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.jdt.core.IAnnotatable;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.NormalAnnotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsValuesColumnLabelProvider extends ColumnLabelProvider {
-    private TreeViewer annotationTreeViewer;
-    private Image true_image;
-    private Image false_image;
-    
-    public AnnotationsValuesColumnLabelProvider(TreeViewer annotationTreeViewer) {
-        this.annotationTreeViewer = annotationTreeViewer;
-        true_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/true.gif") //$NON-NLS-1$
-                .createImage();
-        false_image = JAXWSUIPlugin.imageDescriptorFromPlugin(JAXWSUIPlugin.PLUGIN_ID, "icons/obj16/false.gif") //$NON-NLS-1$
-                .createImage();
-    }
-    
-    @Override
-    public String getText(Object element) {
-        String text = ""; //$NON-NLS-1$
-        if (element instanceof Method) {
-            text =  getTextForMethod((Method)element);
-        }
-        return text;
-    }
-    
-    private String getTextForMethod(Method method) {
-        String text = ""; //$NON-NLS-1$
-        if (annotationTreeViewer.getInput() instanceof IAnnotatable) {
-            text = getTextForMethod(method, (IAnnotatable) annotationTreeViewer.getInput());
-        } else if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
-            text = getTextForMethod(method, (SingleVariableDeclaration)annotationTreeViewer.getInput());
-        }
-        return text;
-    }
-
-    private String getTextForMethod(Method method, IAnnotatable annotatedElement) {
-        Class<?> returnType = method.getReturnType();
-        try {
-            IAnnotation[] annotations = annotatedElement.getAnnotations();
-            for (IAnnotation annotation : annotations) {
-                Class<?> declaringClass = method.getDeclaringClass();
-                if (annotation.getElementName().equals(declaringClass.getSimpleName())
-                        || annotation.getElementName().equals(declaringClass.getCanonicalName())) {
-                    IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-                    for (IMemberValuePair memberValuePair : memberValuePairs) {
-                        if (memberValuePair.getValue() == null) {
-                            break;
-                        }
-                        if (memberValuePair.getMemberName().equals(method.getName())) {
-                            if (returnType.equals(String.class)) {
-                                return memberValuePair.getValue().toString();
-                            }
-                            
-                            if (returnType.equals(Class.class)) {
-                                return memberValuePair.getValue().toString() + ".class";  //$NON-NLS-1$
-                            }
-                            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))) {
-                                return memberValuePair.getValue().toString();
-                            }
-                            
-                            if (returnType.isArray()) {
-                                Object[] values = (Object[])memberValuePair.getValue();
-                                if (values != null && values.length > 0) {
-                                    return "[]{...}"; //$NON-NLS-1$
-                                } else {
-                                    return "[]{}"; //$NON-NLS-1$
-                                }
-                            }
-                            
-                            if (returnType.isEnum()) {
-                                String enumValue = memberValuePair.getValue().toString();
-                                return enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        return ""; //$NON-NLS-1$
-    }
-
-    @SuppressWarnings("unchecked")
-    private String getTextForMethod(Method method, SingleVariableDeclaration singleVariableDeclaration) {
-        Class<?> returnType = method.getReturnType();
-        List<IExtendedModifier> modifiers = singleVariableDeclaration.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof NormalAnnotation) {
-                NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
-                String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
-                Class<?> declaringClass = method.getDeclaringClass();
-                if (annotationName.equals(declaringClass.getSimpleName()) || 
-                        annotationName.equals(declaringClass.getCanonicalName())) {
-                    List<MemberValuePair> memberValuePairs = normalAnnotation.values();
-                    for (MemberValuePair memberValuePair : memberValuePairs) {
-                        if (memberValuePair.getName().toString().equals(method.getName())) {
-                            if (returnType.equals(String.class)) {
-                                StringLiteral stringLiteral = (StringLiteral)memberValuePair.getValue();
-                                return stringLiteral.getLiteralValue();
-                            }
-
-                            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))) {
-                                return memberValuePair.getValue().toString();
-                            }
-
-                            if (returnType.isEnum()) {
-                                String enumValue = memberValuePair.getValue().toString();
-                                return enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return ""; //$NON-NLS-1$
-    }
-    
-    @Override
-    public Image getImage(Object element) {
-        try {
-            if (element instanceof Class) {
-                return getImageForClass((Class<?>) element);
-            }
-            if (element instanceof Method) {
-                return getImageForMethod((Method) element);
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        return null;
-    }
-        
-    private Image getImageForClass(Class<?> aClass) throws JavaModelException {
-        if (annotationTreeViewer.getInput() instanceof IAnnotatable) {
-            return getImageForClass(aClass, (IAnnotatable) annotationTreeViewer.getInput());
-        }
-        
-        if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
-            return getImageForClass(aClass, (SingleVariableDeclaration)annotationTreeViewer.getInput());
-        }
-        return false_image;        
-    }
-    
-    private Image getImageForClass(Class<?> aClass, IAnnotatable annotatedElement) throws JavaModelException {
-        IAnnotation[] annotations = annotatedElement.getAnnotations();
-        for (IAnnotation annotation : annotations) {
-            String annotationName = annotation.getElementName();
-            if (AnnotationUtils.isAnnotationPresent((IJavaElement)annotatedElement, annotationName) && 
-                    (annotationName.equals(aClass.getSimpleName()) || 
-                    annotationName.equals(aClass.getCanonicalName()))) {
-                return true_image;
-            }
-        }
-        return false_image;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private Image getImageForClass(Class<?> aClass, SingleVariableDeclaration parameter) {
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation annotation = (Annotation) extendedModifier;
-                String annotationName = AnnotationUtils.getAnnotationName(annotation);
-                if (AnnotationUtils.isAnnotationPresent(parameter, annotation)
-                        && (annotationName.equals(aClass.getSimpleName())
-                        || annotationName.equals(aClass.getCanonicalName()))) {
-                    return true_image;
-                }
-            }
-        }
-        return false_image;
-    }
-    
-    private Image getImageForMethod(Method method) throws JavaModelException {
-        Class<?> returnType = method.getReturnType();
-        if (returnType.equals(Boolean.TYPE)) {
-            if (annotationTreeViewer.getInput() instanceof IAnnotatable) {
-                return getImageForMethod(method, (IAnnotatable) annotationTreeViewer.getInput());
-            }
-            if (annotationTreeViewer.getInput() instanceof SingleVariableDeclaration) {
-                return getImageForMethod(method, (SingleVariableDeclaration)annotationTreeViewer.getInput());
-            }
-        }
-        return null;
-    }
-
-    private Image getImageForMethod(Method method, IAnnotatable annotatedElement) throws JavaModelException {
-        IAnnotation[] annotations = annotatedElement.getAnnotations();
-        for (IAnnotation annotation : annotations) {
-            String annotationName = annotation.getElementName();
-            Class<?> declaringClass = method.getDeclaringClass();
-            if (annotationName.equals(declaringClass.getSimpleName())
-                    || annotationName.equals(declaringClass.getCanonicalName())) {
-                IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-                for (IMemberValuePair memberValuePair : memberValuePairs) {
-                    if (memberValuePair.getMemberName().equals(method.getName())) {
-                        if (Boolean.parseBoolean(memberValuePair.getValue().toString())) {
-                            return true_image;
-                        }
-                    }
-                }
-            }
-        }
-        return false_image;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private Image getImageForMethod(Method method, SingleVariableDeclaration singleVariableDeclaration) 
-            throws JavaModelException {
-        List<IExtendedModifier> modifiers = singleVariableDeclaration.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof NormalAnnotation) {
-                NormalAnnotation annotation = (NormalAnnotation) extendedModifier;
-                String annotationName = AnnotationUtils.getAnnotationName(annotation);
-                Class<?> declaringClass = method.getDeclaringClass();
-                if (annotationName.equals(declaringClass.getSimpleName())
-                        || annotationName.equals(declaringClass.getCanonicalName())) {
-                    List<MemberValuePair> memberValuePairs = annotation.values();
-                    for (MemberValuePair memberValuePair : memberValuePairs) {
-                        if (memberValuePair.getName().toString().equals(method.getName())) {
-                            BooleanLiteral booleanLiteral = (BooleanLiteral)memberValuePair.getValue();
-                            if (booleanLiteral.booleanValue()) {
-                                return true_image;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false_image;
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        true_image.dispose();
-        false_image.dispose();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
deleted file mode 100644
index daa19ec..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsValuesEditingSupport.java
+++ /dev/null
@@ -1,748 +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.jaxws.ui.views;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-
-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.IMember;
-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.JavaModelException;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.BooleanLiteral;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.IExtendedModifier;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-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.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.StringLiteral;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.jdt.internal.ui.util.BusyIndicatorRunnableContext;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.initialization.IAnnotationAttributeInitializer;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.ui.refactoring.RefactoringUI;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * @author sclarke
- * 
- */
-public class AnnotationsValuesEditingSupport extends EditingSupport {
-    private AnnotationsView annotationsView;
-    private TreeViewer treeViewer;
-    
-    private TextCellEditor textCellEditor;
-    private CheckboxCellEditor checkboxCellEditor;
-    private ComboBoxCellEditor comboBoxCellEditor;
-    private ClassDialogCellEditor classDialogCellEditor;
-    private AnnotationArrayCellEditor annotationArrayCellEditor;
-
-    public AnnotationsValuesEditingSupport(AnnotationsView annotationsView, TreeViewer treeViewer) {
-        super(treeViewer);
-        this.treeViewer = treeViewer;
-        this.annotationsView = annotationsView;
-        textCellEditor = new TextCellEditor(treeViewer.getTree());
-        checkboxCellEditor = new CheckboxCellEditor(treeViewer.getTree());
-        comboBoxCellEditor = new ComboBoxCellEditor(treeViewer.getTree(), new String[] {});
-        classDialogCellEditor = new ClassDialogCellEditor(treeViewer.getTree());
-        annotationArrayCellEditor = new AnnotationArrayCellEditor(treeViewer.getTree(), new Object[] {});
-    }
-
-    @Override
-    protected boolean canEdit(Object element) {
-        if (element instanceof Method) {
-            Method method = (Method)element;
-            return (Boolean) getValue(method.getDeclaringClass());
-        }
-        return true;
-    }
-
-    @Override
-    protected CellEditor getCellEditor(Object element) {
-        if (element instanceof Class) {
-            return checkboxCellEditor;
-        }
-        if (element instanceof Method) {
-            Method method = (Method) element;
-            final Class<?> returnType = method.getReturnType();
-            if (returnType.isEnum()) {
-                Object[] enumConstants = returnType.getEnumConstants();
-                String[] values = new String[enumConstants.length];
-                for (int i = 0; i < enumConstants.length; i++) {
-                    values[i] = enumConstants[i].toString();
-                }
-                comboBoxCellEditor.setItems(values);
-                return comboBoxCellEditor;
-            }
-            if (returnType.equals(Boolean.TYPE)) {
-                return checkboxCellEditor;
-            }
-            
-            if (returnType.equals(Class.class)) {
-                return classDialogCellEditor;
-            }
-            
-            if (returnType.isArray()) {
-                annotationArrayCellEditor.setMethod(method);
-                return annotationArrayCellEditor;
-            }
-            if (returnType.isPrimitive()) {
-                textCellEditor.setValidator(new ICellEditorValidator() {
-                    public String isValid(Object value) {
-                        try {
-                            if (returnType.equals(Byte.TYPE)) {
-                                Byte.parseByte((String) value);
-                            }
-                            if (returnType.equals(Short.TYPE)) {
-                                Short.parseShort((String) value);
-                            }
-                            if (returnType.equals(Integer.TYPE)) {
-                                Integer.parseInt((String) value);
-                            }
-                            if (returnType.equals(Long.TYPE)) {
-                                Long.parseLong((String) value);
-                            }
-                            if (returnType.equals(Float.TYPE)) {
-                                Float.parseFloat((String) value);
-                            }
-                            if (returnType.equals(Double.TYPE)) {
-                                Double.parseDouble((String) value);
-                            }
-                        } catch (NumberFormatException nfe) {
-                            return JAXWSUIMessages.ANNOTATION_EDITING_SUPPORT_NOT_VALID_MESSAGE_PREFIX 
-                                + returnType.getSimpleName();
-                        }
-                        return null;
-                    }
-                });
-                return textCellEditor;
-            }
-            return textCellEditor;
-        }
-        return checkboxCellEditor;
-    }
-    
-    @Override
-    protected Object getValue(Object element) {
-        if (element instanceof Class) {
-            return getValueForClass((Class<?>) element);
-        }
-        if (element instanceof Method) {
-            return getValueForMethod((Method) element);
-        }
-        return null;
-    }
-    
-    private Object getValueForClass(Class<?> aClass) {
-        if (treeViewer.getInput() instanceof IAnnotatable) {
-            return getValueForClass(aClass, (IAnnotatable) treeViewer.getInput());
-        }
-        if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
-            return getValueForClass(aClass, (SingleVariableDeclaration) treeViewer.getInput());
-        }
-        return Boolean.FALSE;
-    }
-    
-    private Object getValueForClass(Class<?> aClass, IAnnotatable annotatedElement) {
-        try {
-            IAnnotation[] annotations = annotatedElement.getAnnotations();
-            for (IAnnotation annotation : annotations) {
-                String annotationName = annotation.getElementName();
-                if (AnnotationUtils.isAnnotationPresent((IJavaElement)annotatedElement, annotationName)
-                        && (annotationName.equals(aClass.getSimpleName())
-                        || annotationName.equals(aClass.getCanonicalName()))) {
-                    return Boolean.TRUE;
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        } 
-        return Boolean.FALSE;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private Object getValueForClass(Class<?> aClass, SingleVariableDeclaration parameter) {
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof Annotation) {
-                Annotation annotation = (Annotation) extendedModifier;
-                String annotationName = AnnotationUtils.getAnnotationName(annotation);
-                if (AnnotationUtils.isAnnotationPresent(parameter, annotation)
-                        && (annotationName.equals(aClass.getSimpleName())
-                        || annotationName.equals(aClass.getCanonicalName()))) {
-                    return Boolean.TRUE;
-                }
-            }
-        }
-        return Boolean.FALSE;
-    }
-
-    private Object getValueForMethod(Method method) {
-        Object value = null;
-        try {
-            if (treeViewer.getInput() instanceof IAnnotatable) {
-                value = getValueForMethod(method, (IAnnotatable) treeViewer.getInput());
-            } else if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
-                value = getValueForMethod(method, (SingleVariableDeclaration) treeViewer
-                        .getInput());
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        return value;
-    }
-    
-    private Object getValueForMethod(Method method, IAnnotatable annotatedElement) throws JavaModelException {
-        Class<?> returnType = method.getReturnType();
-        IAnnotation[] annotations = annotatedElement.getAnnotations();
-        for (IAnnotation annotation : annotations) {
-            Class<?> declaringClass = method.getDeclaringClass();
-            String annotationName = annotation.getElementName();
-            if (annotationName.equals(declaringClass.getSimpleName())
-                    || annotationName.equals(declaringClass.getCanonicalName())) {
-                IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-                for (IMemberValuePair memberValuePair : memberValuePairs) {
-                    if (memberValuePair.getMemberName().equals(method.getName())) {
-                        if (returnType.equals(String.class)) {
-                            return memberValuePair.getValue();
-                        }
-
-                        if (returnType.isEnum()) {
-                            String enumValue = memberValuePair.getValue().toString();
-                            String literal = enumValue.substring(enumValue.lastIndexOf(".") + 1); //$NON-NLS-1$
-                            Object[] enumConstants = method.getReturnType().getEnumConstants();
-                            for (int i = 0; i < enumConstants.length; i++) {
-                                if (enumConstants[i].toString().equals(literal)) {
-                                    return i;
-                                }
-                            }
-                        }
-
-                        if (returnType.equals(Class.class)) {
-                            return memberValuePair.getValue();
-                        }
-                        
-                        if (returnType.equals(Boolean.TYPE)) {
-                            return memberValuePair.getValue();
-                        }
-
-                        if (returnType.isPrimitive()) {
-                            return ""; //$NON-NLS-1$
-                        }
-                        if (returnType.isArray()) {
-                            if (memberValuePair.getValueKind() == IMemberValuePair.K_CLASS) {
-                                Object[] arrayValues = (Object[])memberValuePair.getValue();
-                                for (int i = 0; i < arrayValues.length; i++) {
-                                    String value = arrayValues[i].toString();
-                                    arrayValues[i] = value + ".class";
-                                }
-                                return arrayValues;
-                            }
-                            return memberValuePair.getValue();
-                        }
-                    }
-                }
-                return getDefaultValueForMethod(returnType);
-            }
-        }
-        return null;
-    }
-    
-    @SuppressWarnings("unchecked")
-    private Object getValueForMethod(Method method, SingleVariableDeclaration parameter) {
-        Class<?> returnType = method.getReturnType();
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof NormalAnnotation) {
-                NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
-                Class<?> declaringClass = method.getDeclaringClass();
-                String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
-                if (annotationName.equals(declaringClass.getSimpleName())
-                        || annotationName.equals(declaringClass.getCanonicalName())) {
-                    List<MemberValuePair> memberValuePairs = normalAnnotation.values();
-                    for (MemberValuePair memberValuePair : memberValuePairs) {
-                        if (memberValuePair.getName().toString().equals(method.getName())) {
-                            if (returnType.equals(String.class)) {
-                                StringLiteral stringLiteral = (StringLiteral) memberValuePair
-                                        .getValue();
-                                return stringLiteral.getLiteralValue();
-                            }
-
-                            if (returnType.isEnum()) {
-                                QualifiedName enumValue = (QualifiedName) memberValuePair
-                                        .getValue();
-                                SimpleName literal = enumValue.getName();
-                                
-                                Object[] enumConstants = method.getReturnType()
-                                        .getEnumConstants();
-                                for (int i = 0; i < enumConstants.length; i++) {
-                                    if (enumConstants[i].toString().equals(literal.getIdentifier())) {
-                                        return i;
-                                    }
-                                }
-                            }
-
-                            if (returnType.equals(Class.class)) {
-                                return memberValuePair.getValue();
-                            }
-
-                            if (returnType.equals(Boolean.TYPE)) {
-                                BooleanLiteral booleanLiteral = (BooleanLiteral) memberValuePair
-                                        .getValue();
-                                return booleanLiteral.booleanValue();
-                            }
-                        }
-                    }
-                    return getDefaultValueForMethod(returnType);
-                }
-            }
-        }
-        return null;
-    }
-    
-    private Object getDefaultValueForMethod(Class<?> returnType) {
-        if (returnType.equals(String.class)) {
-            return ""; //$NON-NLS-1$
-        }
-        if (returnType.equals(Boolean.TYPE)) {
-            return Boolean.FALSE;
-        }
-        if (returnType.isEnum()) {
-            return -1;
-        }
-        if (returnType.isPrimitive()) {
-            return ""; //$NON-NLS-1$
-        }
-        if (returnType.isArray()) {
-            return new Object[] {};
-        }
-        return null;
-    }
-        
-    @Override
-    protected void setValue(Object element, Object value) {
-        if (value == null) {
-            return;
-        }
-
-        try {
-            if (element instanceof Class) {
-                Class<? extends java.lang.annotation.Annotation> annotationClass = 
-                    AnnotationsManager.getAnnotationDefinitionForClass(element).getAnnotationClass();
-                
-                if (annotationClass != null) {
-                    setValueForClass(annotationClass, (Boolean) value);
-                }
-            }
-            if (element instanceof Method) {
-                setValueForMethod((Method) element, value);
-            }
-        } catch (CoreException ce) {
-            JAXWSUIPlugin.log(ce.getStatus());
-        } 
-    }
-    
-    private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass, 
-            Boolean annotate) throws CoreException {
-        Object viewerInput = treeViewer.getInput();
-
-        IAnnotationAttributeInitializer annotationAttributeInitializer = 
-            AnnotationsManager.getAnnotationDefinitionForClass(annotationClass).getAnnotationAttributeInitializer();
-        
-        if (viewerInput instanceof IPackageDeclaration) {
-            setValueForClass(annotationClass, annotate, (IPackageDeclaration) viewerInput, 
-                    annotationAttributeInitializer);
-        } else if (viewerInput instanceof IMember) {
-            setValueForClass(annotationClass, annotate, (IMember) viewerInput, annotationAttributeInitializer);
-        } else if (viewerInput instanceof SingleVariableDeclaration) {
-            setValueForClass(annotationClass, annotate, (SingleVariableDeclaration) viewerInput,
-                    annotationAttributeInitializer);
-        }
-    }
-    
-    private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
-            Boolean annotate, IPackageDeclaration packageDeclaration,
-            IAnnotationAttributeInitializer annotationAttributeInitializer) throws CoreException {
-        
-        ICompilationUnit source = JDTUtils.getCompilationUnitFromFile((IFile)packageDeclaration.getResource());
-        CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-        
-        PackageDeclaration pkgDeclaration = compilationUnit.getPackage();
-
-        AST ast = pkgDeclaration.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer, 
-                pkgDeclaration, ast, annotationClass);
-
-        Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass, 
-                annotationClass.getSimpleName(), memberValueParis);
-
-        TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
-        if (annotate) {
-            AnnotationUtils.createPackageDeclarationAnnotationChange(source, pkgDeclaration, rewriter,
-                    annotation, textFileChange);
-        } else {
-            AnnotationUtils.removeAnnotationFromPackageDeclaration(source, pkgDeclaration, rewriter, 
-                    annotation, textFileChange);
-        }
-
-        AnnotationUtils.addImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
-        executeChange(new NullProgressMonitor(), textFileChange);
-    }
-
-    private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
-            Boolean annotate, IMember member, IAnnotationAttributeInitializer annotationAttributeInitializer) 
-                throws CoreException {
-        ICompilationUnit source = member.getCompilationUnit();
-        CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer, member,
-                ast, annotationClass);
-
-        Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass,
-                annotationClass.getSimpleName(), memberValueParis);
-
-        TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
-        if (annotate) {
-            if (member.getElementType() == IJavaElement.TYPE) {
-                AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                        source.findPrimaryType(), annotation, textFileChange);
-            } else if (member.getElementType() == IJavaElement.METHOD) {
-                AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter,
-                        (IMethod) member, annotation, textFileChange);
-            } else if (member.getElementType() == IJavaElement.FIELD) {
-                AnnotationUtils.createFieldAnnotationChange(source, compilationUnit, rewriter,
-                        (IField) member, annotation, textFileChange);
-            }
-        } else {
-            if (member.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
-                
-            }
-            if (member.getElementType() == IJavaElement.TYPE) {
-                AnnotationUtils.removeAnnotationFromType(source, compilationUnit, rewriter,
-                        source.findPrimaryType(), annotation, textFileChange);
-            } else if (member.getElementType() == IJavaElement.METHOD) {
-                AnnotationUtils.removeAnnotationFromMethod(source, compilationUnit, rewriter,
-                        (IMethod) member, annotation, textFileChange);
-            } else if (member.getElementType() == IJavaElement.FIELD) {
-                AnnotationUtils.removeAnnotationFromField(source, compilationUnit, rewriter,
-                        (IField) member, annotation, textFileChange);
-            }
-        }
-        
-        AnnotationUtils.addImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
-        executeChange(new NullProgressMonitor(), textFileChange);
-    }
-  
-    private void setValueForClass(Class<? extends java.lang.annotation.Annotation> annotationClass,
-            Boolean annotate, SingleVariableDeclaration parameter, 
-            IAnnotationAttributeInitializer annotationAttributeInitializer) throws CoreException {
-        ITextEditor txtEditor = (ITextEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getActivePage().getActiveEditor();
-        IFile file = ((IFileEditorInput) txtEditor.getEditorInput()).getFile();
-        ICompilationUnit source = JDTUtils.getCompilationUnitFromFile(file);
-
-        CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-        AST ast = parameter.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        List<MemberValuePair> memberValueParis = getMemberValuePairs(annotationAttributeInitializer, 
-                parameter, ast, annotationClass);
-
-        Annotation annotation = AnnotationsCore.createAnnotation(ast, annotationClass,
-                annotationClass.getSimpleName(), memberValueParis);
-
-        TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
-        if (annotate) {
-            AnnotationUtils.createMethodParameterAnnotationChange(source, rewriter, parameter, annotation,
-                    textFileChange);
-        } else {
-            AnnotationUtils.removeAnnotationFromMethodParameter(source, rewriter, parameter, annotation,
-                    textFileChange);
-        }
-        AnnotationUtils.addImportChange(compilationUnit, annotationClass, textFileChange, annotate);
-
-        executeChange(new NullProgressMonitor(), textFileChange);
-    }
-    
-    private List<MemberValuePair> getMemberValuePairs(
-            IAnnotationAttributeInitializer annotationAttributeInitializer, ASTNode astNode, AST ast, 
-            Class<?extends java.lang.annotation.Annotation> annotationClass) {
-        if (annotationAttributeInitializer != null) {
-            return annotationAttributeInitializer.getMemberValuePairs(astNode, ast, annotationClass);
-        }
-        return Collections.emptyList();
-    }
-    
-    private List<MemberValuePair> getMemberValuePairs(
-            IAnnotationAttributeInitializer annotationAttributeInitializer, IJavaElement javaElement, AST ast, 
-            Class<?extends java.lang.annotation.Annotation> annotationClass) {
-        if (annotationAttributeInitializer != null) {
-            return annotationAttributeInitializer.getMemberValuePairs(javaElement, ast, annotationClass);
-        }
-        return Collections.emptyList();
-    }
-
-
-    private void setValueForMethod(Method method, Object value) throws CoreException {
-        if (((Boolean) getValue(method.getDeclaringClass())).booleanValue()) {
-            Object viewerInput = treeViewer.getInput();
-            if (viewerInput instanceof IAnnotatable) {
-                setValueForMethod(method, value, (IJavaElement) viewerInput);
-            } else if (treeViewer.getInput() instanceof SingleVariableDeclaration) {
-                setValueForMethod(method, value, (SingleVariableDeclaration) treeViewer.getInput());
-            }
-        }
-    }
-    
-    private ICompilationUnit getCompilationUnitForType(IJavaElement javaElement) throws JavaModelException {
-        int elementType = javaElement.getElementType();
-        if (elementType == IJavaElement.TYPE) {
-            IType type = (IType)javaElement.getPrimaryElement();
-            return type.getCompilationUnit();
-        }
-        if (elementType == IJavaElement.METHOD) {
-            IMethod method = (IMethod)javaElement.getPrimaryElement();
-            return method.getCompilationUnit();
-        }
-        if (elementType == IJavaElement.FIELD) {
-            IField field = (IField)javaElement.getPrimaryElement();
-            return field.getCompilationUnit();
-        }
-        return JDTUtils.getCompilationUnitFromFile((IFile)javaElement.getCorrespondingResource());
-    }
-
-    private void setValueForMethod(Method method, Object value, IJavaElement javaElement) throws CoreException {
-        ICompilationUnit source = getCompilationUnitForType(javaElement);        
-        CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-        AST ast = compilationUnit.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
-        IAnnotatable annotatedElement = (IAnnotatable) javaElement;
-        IAnnotation[] annotations = annotatedElement.getAnnotations();
-        for (IAnnotation annotation : annotations) {
-            Class<?> declaringClass = method.getDeclaringClass();
-            String annotationName = annotation.getElementName();
-            if (annotationName.equals(declaringClass.getSimpleName())
-                    || annotationName.equals(declaringClass.getCanonicalName())) {
-                IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
-                boolean hasMemberValuePair = false;
-                for (IMemberValuePair memberValuePair : memberValuePairs) {
-                    if (memberValuePair.getMemberName().equals(method.getName())) {
-                        ASTNode memberValue = getMemberValuePairValue(ast, method, value);
-                        if (memberValue != null) {
-                            AnnotationUtils.updateMemberValuePairValue(source,
-                                    compilationUnit, rewriter, javaElement, annotation,
-                                    memberValuePair, memberValue, textFileChange);
-                            hasMemberValuePair = true;
-                            break;
-                        }
-                    }
-                }
-                if (!hasMemberValuePair) {
-                    ASTNode memberValuePair = getMemberValuePair(ast, method, value);
-                    if (memberValuePair != null) {
-                        AnnotationUtils
-                                .createMemberValuePairChange(source, compilationUnit,
-                                        rewriter, javaElement, annotation, memberValuePair,
-                                        textFileChange);
-                        break;
-                    }
-                }
-            }
-        }
-        executeChange(new NullProgressMonitor(), textFileChange);
-    }
-    
-    @SuppressWarnings("unchecked")
-    private void setValueForMethod(Method method, Object value, SingleVariableDeclaration parameter) 
-            throws CoreException {
-        ITextEditor txtEditor = (ITextEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getActivePage().getActiveEditor();
-        IFile file = ((IFileEditorInput) txtEditor.getEditorInput()).getFile();
-        ICompilationUnit source = JDTUtils.getCompilationUnitFromFile(file);
-
-        CompilationUnit compilationUnit = JDTUtils.getCompilationUnit(source);
-        AST ast = parameter.getAST();
-        ASTRewrite rewriter = ASTRewrite.create(ast);
-
-        TextFileChange textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-
-        List<IExtendedModifier> modifiers = parameter.modifiers();
-        for (IExtendedModifier extendedModifier : modifiers) {
-            if (extendedModifier instanceof NormalAnnotation) {
-                NormalAnnotation normalAnnotation = (NormalAnnotation) extendedModifier;
-                String annotationName = AnnotationUtils.getAnnotationName(normalAnnotation);
-                Class<?> declaringClass = method.getDeclaringClass();
-                if (annotationName.equals(declaringClass.getSimpleName())
-                        || annotationName.equals(declaringClass.getCanonicalName())) {
-                    List<MemberValuePair> memberValuePairs = normalAnnotation.values();
-                    boolean hasMemberValuePair = false;
-                    for (MemberValuePair memberValuePair : memberValuePairs) {
-                        if (memberValuePair.getName().toString().equals(method.getName())) {
-                            ASTNode memberValue = getMemberValuePairValue(ast, method, value);
-                            if (memberValue != null) {
-                                AnnotationUtils.updateMemberValuePairValue(source, compilationUnit, rewriter,
-                                        normalAnnotation, memberValuePair, memberValue, textFileChange);
-                                hasMemberValuePair = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!hasMemberValuePair) {
-                        ASTNode memberValuePair = getMemberValuePair(ast, method, value);
-                        if (memberValuePair != null) {
-                            AnnotationUtils.createMemberValuePairChange(source, compilationUnit, rewriter,
-                                    normalAnnotation, memberValuePair, textFileChange);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        executeChange(new NullProgressMonitor(), textFileChange);
-    }
-
-    private ASTNode getMemberValuePairValue(AST ast, Method method, Object value) {
-        Class<?> returnType = method.getReturnType();
-        if (returnType.equals(String.class)) {
-            return AnnotationsCore.createStringLiteral(ast, value.toString());
-        }
-        if (returnType.equals(Boolean.TYPE)) {
-            return AnnotationsCore.createBooleanLiteral(ast, ((Boolean) value).booleanValue());
-        }
-        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))) {
-            return AnnotationsCore.createNumberLiteral(ast, value.toString());
-        }
-        if (returnType.isArray()) {
-            return AnnotationsCore.createArrayValueLiteral(ast, method, (Object[]) value);
-        }
-        
-        if (returnType.equals(Class.class)) {
-            return AnnotationsCore.createTypeLiteral(ast, value.toString());
-        }
-        
-        if (returnType.isEnum()) {
-            int selected = ((Integer) value).intValue();
-            if (selected != -1) {
-                return AnnotationsCore.createEnumLiteral(ast, method.getDeclaringClass().getCanonicalName(),
-                        method.getReturnType().getEnumConstants()[selected]);
-            }
-        }
-        return null;
-    }
-
-    private ASTNode getMemberValuePair(AST ast, Method method, Object value) {
-        Class<?> returnType = method.getReturnType();
-        if (returnType.equals(String.class)) {
-            return AnnotationsCore.createStringMemberValuePair(ast, method.getName(), value);
-        }
-        if (returnType.equals(Boolean.TYPE)) {
-            return AnnotationsCore.createBooleanMemberValuePair(ast, method.getName(), value);
-        }
-        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))) {
-            return AnnotationsCore.createNumberMemberValuePair(ast, method.getName(), value.toString());
-        }
-        if (returnType.isArray()) {
-            return AnnotationsCore.createArrayMemberValuePair(ast, method, (Object[]) value);
-        }
-        
-        if (returnType.equals(Class.class)) {
-            return AnnotationsCore.createTypeMemberValuePair(ast, method.getName(), value.toString());
-        }
-
-        if (returnType.isEnum()) {
-            int selected = ((Integer) value).intValue();
-            if (selected != -1) {
-                return AnnotationsCore.createEnumMemberValuePair(ast, 
-                       method.getDeclaringClass().getCanonicalName(), method.getName(), method.getReturnType()
-                        .getEnumConstants()[selected]);
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings("restriction")
-    private void executeChange(IProgressMonitor monitor, Change change) {
-        if (change == null) {
-            return;
-        }
-
-        change.initializeValidationData(monitor);
-
-        PerformChangeOperation changeOperation = RefactoringUI.createUIAwareChangeOperation(change);
-
-        WorkbenchRunnableAdapter adapter = new WorkbenchRunnableAdapter(changeOperation);
-        try {
-            PlatformUI.getWorkbench().getProgressService().runInUI(new BusyIndicatorRunnableContext(), adapter,
-                adapter.getSchedulingRule());
-        } catch (InvocationTargetException ite) {
-            JAXWSUIPlugin.log(ite);
-        } catch (InterruptedException ie) {
-            JAXWSUIPlugin.log(ie);
-        }
-            
-        annotationsView.refresh();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
deleted file mode 100755
index ba965bf..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,469 +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.jaxws.ui.views;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.jst.ws.internal.jaxws.ui.actions.AnnotationsViewFilterAction;
-import org.eclipse.jst.ws.internal.jaxws.ui.widgets.ClasspathComposite;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-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.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.INullSelectionListener;
-import org.eclipse.ui.IPartListener2;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartReference;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsView extends ViewPart implements INullSelectionListener, IPartListener2 {
-    private PageBook pageBook;
-    private Tree annotationTree;
-
-    private Composite notAvaiableComposite;
-    private ClasspathComposite setupClasspathComposite;
-    
-	private TreeViewer annotationTreeViewer;
-	
-	private IMemento memento;
-	
-	private AnnotationsViewFilterAction annotationsViewFilterAction;
-
-	public AnnotationsView() {
-	}
-
-    public void createPartControl(Composite parent) {
-        pageBook = new PageBook(parent, SWT.NONE);
-        
-        annotationTree = new Tree(pageBook, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.V_SCROLL
-                | SWT.H_SCROLL);
-        annotationTreeViewer = new TreeViewer(annotationTree);
-		
-		annotationTreeViewer.setContentProvider(new AnnotationsViewContentProvider());
-		annotationTreeViewer.getTree().setHeaderVisible(true);
-		annotationTreeViewer.getTree().setLinesVisible(true);
-		
-		TreeViewerColumn annotationsViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
-		annotationsViewerColumn.setLabelProvider(new AnnotationsColumnLabelProvider());
-		TreeColumn annotationsColumn = annotationsViewerColumn.getColumn();
-		annotationsColumn.setWidth(400);
-        annotationsColumn.setMoveable(false);
-        annotationsColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_COLUMN_NAME);
-        
-        TreeViewerColumn valuesViewerColumn = new TreeViewerColumn(annotationTreeViewer, SWT.NONE);
-        valuesViewerColumn.setLabelProvider(new AnnotationsValuesColumnLabelProvider(annotationTreeViewer));
-        valuesViewerColumn.setEditingSupport(new AnnotationsValuesEditingSupport(this, annotationTreeViewer));
-        TreeColumn valuesColumn = valuesViewerColumn.getColumn(); 
-		valuesColumn.setWidth(400);
-		valuesColumn.setMoveable(false);
-		valuesColumn.setAlignment(SWT.LEFT);
-		valuesColumn.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_VALUES_COLUMN_NAME);
-		
-		//Selection Service
-		startListeningForSelectionChanges();
-		//Part Service
-		getViewSite().getWorkbenchWindow().getPartService().addPartListener(this);
-		
-		contributeToActionBars();
-		
-		notAvaiableComposite = new Composite(pageBook, SWT.NONE);
-		GridLayout gridLayout = new GridLayout();
-		notAvaiableComposite.setLayout(gridLayout);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		notAvaiableComposite.setLayoutData(gridData);
-		notAvaiableComposite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		Label label = new Label(notAvaiableComposite, SWT.NONE);
-		label.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		label.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_ANNOTATIONS_NOT_AVAILABLE_ON_SELECTION);
-		
-		annotationTreeViewer.setComparator(new ViewerComparator() {
-            @Override
-            public int compare(Viewer viewer, Object obj1, Object obj2) {
-                if (obj1 instanceof Class<?>) {
-                  return AnnotationsManager.getAnnotationDefinitionForClass(obj1).getAnnotationClassName().
-                      compareTo(AnnotationsManager.getAnnotationDefinitionForClass(obj2).
-                              getAnnotationClassName());
-                }
-                if (obj1 instanceof Method) {
-                    return ((Method)obj1).getName().compareTo(((Method)obj2).getName());
-                }
-                return super.compare(viewer, obj1, obj2);
-            }
-		});
-		
-		//TODO Add a Faceted Project composite
-		setupClasspathComposite = new ClasspathComposite(pageBook, SWT.NONE);
-
-		pageBook.showPage(notAvaiableComposite);
-	}
-    
-    private void startListeningForSelectionChanges() {
-        getViewSite().getWorkbenchWindow().getSelectionService().addPostSelectionListener(this);
-    }
-    
-    private void stopListeningForSelectionChanges() {
-        getViewSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this);
-    }
-    
-    public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-        IWorkbenchPage workbenchPage = getViewSite().getWorkbenchWindow().getActivePage();
-        IWorkbenchPartReference workbenchPartReference = workbenchPage.getActivePartReference();
-       
-        if ( workbenchPartReference.getId().equals(getViewSite().getId()) 
-                || !workbenchPartReference.getId().equals(JavaUI.ID_CU_EDITOR)) {
-            return;
-        }
-
-        IEditorPart editorPart = workbenchPage.getActiveEditor();
-
-        IFileEditorInput fileEditorInput = (IFileEditorInput) editorPart.getEditorInput();
-
-        if (selection instanceof TextSelection) {
-            ITextSelection txtSelection = (TextSelection) selection;
-            ICompilationUnit compilationUnit = JDTUtils.getCompilationUnitFromFile(fileEditorInput.getFile());
-            if (compilationUnit != null) {
-                updateView(compilationUnit, txtSelection);
-            }
-        }
-    }
-
-	public void updateView(IJavaElement javaElement, ITextSelection textSelection) {
-        TreePath[] expandedTreePaths = annotationTreeViewer.getExpandedTreePaths();
-
-        IJavaProject javaProject = javaElement.getJavaProject();
-
-        if (!checkClasspath(javaProject)) {
-            annotationTreeViewer.setInput(null);
-            pageBook.showPage(setupClasspathComposite);
-            return;
-        }
-
-        pageBook.showPage(annotationTree);
-
-	    int offset = textSelection.getOffset();
-        try {
-            ICompilationUnit compilationUnit = null;
-            if (javaElement instanceof ICompilationUnit) {
-                compilationUnit = (ICompilationUnit)javaElement;
-                javaElement = compilationUnit.getElementAt(offset);
-            }
-        
-            if (javaElement == null) {
-                return;
-            }
-            
-            if (javaElement.getElementType() == IJavaElement.PACKAGE_DECLARATION) {
-                if (javaElement.getResource().getName().equals("package-info.java")) { //$NON-NLS-1$
-                    annotationTreeViewer.setInput((IPackageDeclaration) javaElement);
-                } else {
-                    annotationTreeViewer.setInput(null);
-                }
-            }
-            
-            if (javaElement.getElementType() == IJavaElement.IMPORT_DECLARATION) {
-                annotationTreeViewer.setInput(null);
-            }
-            
-            if (javaElement.getElementType() == IJavaElement.TYPE) {
-                IType type = (IType)javaElement;
-                if (!type.isMember()) {
-                    annotationTreeViewer.setInput(type);
-                } else {
-                    annotationTreeViewer.setInput(null);
-                }
-            }
-    
-            if (javaElement.getElementType() == IJavaElement.FIELD) {
-                IField field = (IField)javaElement;
-                if (!field.getDeclaringType().isMember()) {
-                    annotationTreeViewer.setInput(field);
-                } else {
-                    annotationTreeViewer.setInput(null);
-                }
-            }
-
-            if (javaElement.getElementType() == IJavaElement.METHOD) {
-                IMethod method = (IMethod) javaElement;
-                if (!method.getDeclaringType().isMember()) {
-                    SingleVariableDeclaration parameter = AnnotationUtils
-                            .getMethodParameter(null, method, offset);
-                    if (parameter != null) {
-                        annotationTreeViewer.setInput(parameter);
-                    } else {
-                        annotationTreeViewer.setInput(method);
-                    }
-                } else {
-                    annotationTreeViewer.setInput(null);
-                }
-            }
-            annotationTreeViewer.refresh();
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        
-        annotationTreeViewer.setExpandedTreePaths(expandedTreePaths);
-	}
-    
-    private boolean checkClasspath(IJavaProject javaProject) {
-        List<String> categories = new ArrayList<String>();
-        categories.addAll(AnnotationsManager.getAnnotationCategories());
-        ViewerFilter[] viewerFilters = annotationTreeViewer.getFilters();
-        for (ViewerFilter viewerFilter : viewerFilters) {
-           if (viewerFilter instanceof AnnotationsViewCategoryFilter) {
-               categories.removeAll(((AnnotationsViewCategoryFilter)viewerFilter).getCategories());
-           }
-        }
-
-        boolean jwsReady = true;
-        try {
-            for (String category : categories) {
-                List<AnnotationDefinition> annotationDefinitions = AnnotationsManager
-                        .getAnnotationsByCategory(category);
-                String className = annotationDefinitions.get(0).getAnnotationClassName();
-                if (javaProject.findType(className) == null) {
-                    jwsReady = false;
-                    setupClasspathComposite.updateLibraryLabel(category);
-                    break;
-                } else {
-                    continue;
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        return jwsReady;
-    }
-
-    public void partActivated(IWorkbenchPartReference partRef) {
-        IWorkbenchPart workbenchPart = partRef.getPart(false);
-        if (partRef.getId().equals(JavaUI.ID_CU_EDITOR)) {
-            javaEditorActivated((IEditorPart) workbenchPart);
-        } else if (partRef.getId().equals(getViewSite().getId())) {
-            annotationsViewActivated();
-        } else {
-            clearAnnotationsView();
-        }
-    }
-
-    public void partDeactivated(IWorkbenchPartReference partRef) {
-    }
-
-    public void partVisible(IWorkbenchPartReference partRef) {
-        if (partRef.getId().equals(getViewSite().getId())) {
-            startListeningForSelectionChanges();
-        }
-    }
-
-    public void partHidden(IWorkbenchPartReference partRef) {
-        if (partRef.getId().equals(getViewSite().getId())) {
-            stopListeningForSelectionChanges();
-        }
-    }
-
-    public void partOpened(IWorkbenchPartReference partRef) {
-    }
-
-    public void partClosed(IWorkbenchPartReference partRef) {
-        if (partRef.getId().equals(JavaUI.ID_CU_EDITOR)) {
-            if (getViewSite() != null) {
-                IWorkbenchWindow workbenchWindow = getViewSite().getWorkbenchWindow();
-                if (workbenchWindow != null) {
-                    IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                    if (workbenchPage != null) {
-                        IEditorPart editorPart = workbenchPage.getActiveEditor();
-                        try {
-                            if (editorPart == null
-                                    || !(editorPart.getEditorInput() instanceof IFileEditorInput)
-                                    || !IDE.getEditorDescriptor(
-                                            ((IFileEditorInput) editorPart.getEditorInput()).getFile()).getId()
-                                            .equals(JavaUI.ID_CU_EDITOR)) {
-                                clearAnnotationsView();
-                            }
-                        } catch (PartInitException pie) {
-                            JAXWSUIPlugin.log(pie.getStatus());
-                        }                 
-                    }
-                }
-            }
-        }
-    }
-
-    public void partBroughtToTop(IWorkbenchPartReference partRef) {
-    }
-
-    public void partInputChanged(IWorkbenchPartReference partRef) {
-    }
-	
-	private void clearAnnotationsView() {
-        annotationTreeViewer.setInput(null);
-        annotationTreeViewer.refresh();
-        pageBook.showPage(notAvaiableComposite);                
-	}
-	
-	private void javaEditorActivated(IEditorPart editorPart) {
-        ITextEditor textEditor = (ITextEditor) editorPart;
-        ISelection selection = textEditor.getSelectionProvider().getSelection();
-        IJavaElement javaElement = (IJavaElement) editorPart.getEditorInput().getAdapter(IJavaElement.class);
-        if (javaElement != null) {
-            pageBook.showPage(annotationTree);
-            updateView(javaElement, (ITextSelection) selection);
-            selectionChanged(editorPart, selection);
-        }
-    }
-
-    private void annotationsViewActivated() {
-        try {
-            IEditorPart editorPart = getViewSite().getPage().getActiveEditor();
-            if (editorPart != null) {
-                IEditorInput editorInput = editorPart.getEditorInput();
-                if (editorInput instanceof IFileEditorInput) {
-                    IFile file = ((IFileEditorInput) editorInput).getFile();
-                    IEditorDescriptor editorDescriptor = IDE.getEditorDescriptor(file);
-                    if (editorDescriptor.getId().equals(JavaUI.ID_CU_EDITOR)) {
-                        javaEditorActivated(editorPart);
-                    }
-                }
-            }
-        } catch (PartInitException pie) {
-            JAXWSUIPlugin.log(pie.getStatus());
-        }
-    }
-	
-    @Override
-    public void dispose() {
-        super.dispose();
-        stopListeningForSelectionChanges();
-        getViewSite().getWorkbenchWindow().getPartService().removePartListener(this);
-    }
-    
-    @Override
-    public void init(IViewSite site, IMemento memento) throws PartInitException {
-        super.init(site, memento);
-        this.memento = memento;
-    }
-
-    @Override
-    public void saveState(IMemento memento) {
-        super.saveState(memento);
-        annotationsViewFilterAction.saveState(memento);
-    }
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-	    annotationsViewFilterAction = new AnnotationsViewFilterAction(this, annotationTreeViewer,
-	            JAXWSUIMessages.ANNOTATIONS_VIEW_FILTER_ACTION_NAME);
-	    if (memento != null) {
-	        annotationsViewFilterAction.init(memento);
-	    }
-	    manager.add(annotationsViewFilterAction);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		annotationTreeViewer.getControl().setFocus();
-	}
-	
-    public void refresh() {
-        Display display = annotationTreeViewer.getControl().getDisplay();
-        if (!display.isDisposed()) {
-            display.asyncExec(new Runnable() {
-                public void run() {
-                    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                    IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                    IEditorPart editorPart = workbenchPage.getActiveEditor();
-                    try {
-                        if (editorPart != null
-                                && editorPart.getEditorInput() instanceof IFileEditorInput
-                                && IDE.getEditorDescriptor(
-                                        ((IFileEditorInput) editorPart.getEditorInput()).getFile()).getId()
-                                        .equals(JavaUI.ID_CU_EDITOR)) {
-                            ITextEditor txtEditor = (ITextEditor) workbenchPage.getActiveEditor();
-                            IFileEditorInput fileEditorInput = (IFileEditorInput) txtEditor.getEditorInput();
-
-                            ICompilationUnit compilationUnit = JDTUtils
-                                    .getCompilationUnitFromFile(fileEditorInput.getFile());
-                            if (compilationUnit != null) {
-                                if (!compilationUnit.isConsistent()) {
-                                    compilationUnit.makeConsistent(new NullProgressMonitor());
-                                }
-                                updateView(compilationUnit, (ITextSelection) txtEditor.getSelectionProvider()
-                                        .getSelection());
-                            }
-                        }
-                    } catch (JavaModelException jme) {
-                        JAXWSUIPlugin.log(jme.getStatus());
-                    } catch (PartInitException pie) {
-                        JAXWSUIPlugin.log(pie.getStatus());
-                    }
-                }
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
deleted file mode 100644
index bf1e0de..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewCategoryFilter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Shane Clarke.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Shane Clarke - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.jaxws.ui.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.annotations.core.AnnotationDefinition;
-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class AnnotationsViewCategoryFilter extends ViewerFilter {
-    private static final String TAG_CATEGORY = "AnnotationCategoryFilterInfo"; //$NON-NLS-1$
-    private static final String TAG_CATEGORY_NAME = "categoryName"; //$NON-NLS-1$
-
-    private AnnotationsView annotationsView;
-    private final StructuredViewer viewer;
-
-    private List<Object> categories;
-    
-    public AnnotationsViewCategoryFilter(AnnotationsView annotationsView, StructuredViewer viewer) {
-        this.annotationsView = annotationsView;
-        this.viewer = viewer;
-        categories = new ArrayList<Object>();
-    }
-    
-    @Override
-    public boolean select(Viewer viewer, Object parentElement, Object element) {
-        if (element instanceof Class) {
-            AnnotationDefinition annotationDefinition = AnnotationsManager.
-                getAnnotationDefinitionForClass(element);
-            if (annotationDefinition != null) {
-                return !categories.contains(annotationDefinition.getCategory());
-            }
-        }
-        return true;
-    }
-
-    public void filterAnnotations(List<Object> categories) {
-        this.categories = categories;
-        if (categories.size() > 0) {
-            viewer.addFilter(this);
-        } else {
-            viewer.removeFilter(this);
-        }
-        annotationsView.refresh();
-    }
-    
-    public List<Object> getCategories() {
-        return categories;
-    }
-    
-    public void init(IMemento memento) {
-        IMemento catMemento = memento.getChild(TAG_CATEGORY);
-        if (catMemento == null) {
-            return;
-        }
-        for (int i = 0; i < AnnotationsManager.getAnnotationCategories().size(); i++) {
-            String category = catMemento.getString(TAG_CATEGORY_NAME + i);
-            if (category != null) {
-                categories.add(category);
-            }
-        }
-        filterAnnotations(categories);
-    }
-    
-    public void saveState(IMemento memento) {
-        if (categories == null || categories.size() == 0) {
-            return;
-        }
-        IMemento catMemento = memento.createChild(TAG_CATEGORY);
-        int i = 0;
-        for (Object category : categories) {
-            catMemento.putString(TAG_CATEGORY_NAME + i, category.toString());
-            i++;
-        }
-    }    
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
deleted file mode 100755
index 033e0ee..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/AnnotationsViewContentProvider.java
+++ /dev/null
@@ -1,56 +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.jaxws.ui.views;

-

-import org.eclipse.jface.viewers.ITreeContentProvider;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jst.ws.annotations.core.AnnotationsManager;

-

-/**

- * 

- * @author sclarke

- *

- */

-public class AnnotationsViewContentProvider implements ITreeContentProvider {

-

-	public Object[] getChildren(Object parentElement) {

-	    if (parentElement instanceof Class) {

-	        return ((Class<?>)parentElement).getDeclaredMethods();

-	    }

-		return new Object[] {};

-	}

-

-	public Object getParent(Object element) {

-		return null;

-	}

-

-	public boolean hasChildren(Object element) {

-	    if (element instanceof Class) {

-	        return ((Class<?>)element).getDeclaredMethods().length > 0;

-	    }

-		return false;

-	}

-

-	public Object[] getElements(Object inputElement) {

-	    if (inputElement != null) {

-	        return AnnotationsManager.getAnnotations(inputElement);

-	    }

-	    return new Object[] {};

-	}

-	

-	public void dispose() {

-

-	}

-

-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

-	}

-

-}

diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
deleted file mode 100644
index 4a15b45..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/views/ClassDialogCellEditor.java
+++ /dev/null
@@ -1,70 +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.jaxws.ui.views;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class ClassDialogCellEditor extends DialogCellEditor {
-
-    public ClassDialogCellEditor(Composite parent) {
-        super(parent, SWT.NONE);
-    }
-    
-    @Override
-    protected Object openDialogBox(Control cellEditorWindow) {
-        try {
-            SelectionDialog dialog = JavaUI.createTypeDialog(cellEditorWindow.getShell(), 
-                    PlatformUI.getWorkbench().getProgressService(), 
-                    SearchEngine.createWorkspaceScope(), IJavaElementSearchConstants.CONSIDER_CLASSES, 
-                    false, "* "); //$NON-NLS-1$
-            
-            if (dialog.open() == IDialogConstants.OK_ID) {
-                Object[] types = dialog.getResult();
-                
-                if (types != null && types.length > 0) {
-                    IType type = (IType)types[0];
-                    if (type.isBinary()) {
-                        return type.getFullyQualifiedName();
-                    }
-                }
-            }
-        } catch (JavaModelException jme) {
-            JAXWSUIPlugin.log(jme.getStatus());
-        }
-        return null;
-    }
-    
-    @Override
-    protected void updateContents(Object value) {
-        if (value != null) {
-            getDefaultLabel().setText(value.toString() + ".class"); 
-        } else {
-            getDefaultLabel().setText("");
-        }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java b/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
deleted file mode 100644
index b454eb4..0000000
--- a/bundles/org.eclipse.jst.ws.jaxws.ui/src/org/eclipse/jst/ws/internal/jaxws/ui/widgets/ClasspathComposite.java
+++ /dev/null
@@ -1,96 +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.jaxws.ui.widgets;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.jaxws.ui.JAXWSUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class ClasspathComposite extends Composite {
-    
-    private String JRE_PREF_PAGE_ID = "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"; //$NON-NLS-1$
-    private String PROP_ID = "org.eclipse.jdt.ui.propertyPages.BuildPathsPropertyPage"; //$NON-NLS-1$
-    private Object DATA_REVEAL_ENTRY = "select_classpath_entry"; //$NON-NLS-1$
-
-    private Label informationLabel;
-    
-    public ClasspathComposite(Composite parent, int style) {
-        super(parent, style);
-        addControls();
-    }
-    
-    public void addControls() {
-        GridLayout gridLayout = new GridLayout();
-        this.setLayout(gridLayout);
-        GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-        this.setLayoutData(gridData);
-        this.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        informationLabel = new Label(this, SWT.NONE);
-        informationLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        informationLabel.setText(JAXWSUIMessages.bind(
-                JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, "JAX-WS"));
-        Link link = new Link(this, SWT.NONE);
-        link.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        link.setText(JAXWSUIMessages.CONFIGURE_JAVA_1_6_LIBRARY);
-        link.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent selectionEvent) {
-                if (selectionEvent.text.equals("1")) { //$NON-NLS-1$
-                    PreferencesUtil.createPreferenceDialogOn(getShell(), JRE_PREF_PAGE_ID,
-                            new String[] { JRE_PREF_PAGE_ID }, null).open();
-                } else {
-                    Map<Object, IClasspathEntry> data = new HashMap<Object, IClasspathEntry>();
-                    data.put(DATA_REVEAL_ENTRY, JavaRuntime.getDefaultJREContainerEntry());
-                    PreferencesUtil.createPropertyDialogOn(getShell(), getProject(), PROP_ID,
-                            new String[] { PROP_ID }, data).open();
-                }
-            }
-        });
-        //TODO update the labels to provide information for supported annotation libraries that are missing
-        //on the selected projects classpath.
-        //Label otherLibrariesLabel  = new Label(this, SWT.SHADOW_IN);
-        //otherLibrariesLabel.setBackground(getParent().getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        //otherLibrariesLabel.setText("Annotation Libraries currently supported: " + AnnotationsManager.getAnnotationCategories());
-        //otherLibrariesLabel.setText(JAXWSUIMessages.ANNOTATIONS_VIEW_OTHER_ANNOTATION_LIBRARIES_USE);
-
-    }
-
-    private IProject getProject() {
-        return ((FileEditorInput) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-                .getActiveEditor().getEditorInput()).getFile().getProject();
-    }
-    
-    
-    public void updateLibraryLabel(String libraryName) {
-        informationLabel.setText(JAXWSUIMessages.bind(
-                JAXWSUIMessages.ANNOTATIONS_VIEW_NO_SUITABLE_LIBRARY_FOUND, libraryName));
-    }
-    
- }
diff --git a/features/org.eclipse.jst.ws.cxf.feature/.project b/features/org.eclipse.jst.ws.cxf.feature/.project
deleted file mode 100644
index 7f8df9b..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf.feature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/feature.properties
deleted file mode 100644
index 1ff79c9..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services 
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf.feature/feature.xml b/features/org.eclipse.jst.ws.cxf.feature/feature.xml
deleted file mode 100644
index 5b7578e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/feature.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.ws.cxf.feature"
-      label="%featureName"
-      version="0.4.2.qualifier"
-      provider-name="%featureProvider"
-      plugin="org.eclipse.jst.ws.cxf.core"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.ws.jaxws.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.jdom"
-         download-size="156"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.consumption.core"
-         download-size="20"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.consumption.ui"
-         download-size="44"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.core"
-         download-size="204"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.creation.core"
-         download-size="52"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.creation.ui"
-         download-size="96"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.cxf.ui"
-         download-size="120"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.wsdl"
-         download-size="0"
-         install-size="0"
-         version="1.6.2.qualifier"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/license.html b/features/org.eclipse.jst.ws.cxf.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,13 +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=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/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 Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index b4a9d00..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +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 Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 60e19e5..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f2ac814..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for CXF Web Services
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 3d169bf..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index a864727..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,13 +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=cxf32.gif
-
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/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/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index dd1352e..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/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 Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright IONA Technologies PLC 2008.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 1c4344d..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, cxf32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/cxf32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 61a2e58..0000000
--- a/features/org.eclipse.jst.ws.cxf.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IONA Technologies PLC
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IONA Technologies PLC - initial API and implementation
-###############################################################################
-
-pluginName=CXF Web Services Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project b/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
deleted file mode 100644
index 31251ce..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cxf_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
deleted file mode 100644
index 59f8b76..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
-
-generate.feature@org.eclipse.jst.ws.cxf.feature.source=org.eclipse.jst.ws.cxf.feature
-               
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
deleted file mode 100644
index b06b79b..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=CXF Web Services SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=CXF Web Services Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2008 IONA Technologies PLC\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IONA Technologies PLC - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
deleted file mode 100644
index a405e0f..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/feature.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.ws.cxf_sdk.feature"
-      label="%featureName"
-      version="0.4.2.qualifier"
-      provider-name="%featureProvider"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.ws.cxf.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.ws.cxf.feature.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.ws.jaxws_sdk.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html b/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.cxf_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/.project b/features/org.eclipse.jst.ws.jaxws.feature/.project
deleted file mode 100644
index 2eb88eb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
deleted file mode 100644
index 246114d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools 
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 Shane Clarke and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
deleted file mode 100644
index e68b36c..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/feature.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.ws.jaxws.feature"
-      label="%featureName"
-      version="0.5.2.qualifier"
-      provider-name="%featureProvider"
-      plugin="org.eclipse.jst.ws.jaxws.core"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.jst.ws.jaxws.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.jaxws.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.ws"
-         download-size="0"
-         install-size="0"
-         version="2.1.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="javax.jws"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jst.ws.annotations.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.bind"
-         download-size="0"
-         install-size="0"
-         version="2.1.9.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="javax.xml.stream"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.activation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index c4a5931..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,13 +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=jaxws32.gif
-
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index b8991df..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Shane Clarke and others 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 556d966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, jaxws32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/jaxws32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/jaxws32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/jaxws32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 757f1cb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index c6af93f..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index b903d8d..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools Developer Resources (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=Source code for JAX-WS Tools 
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 Shane Clarke and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 5131e75..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/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=jaxws32.gif
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/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/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index b8991df..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +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
-###############################################################################
-# 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=JAX-WS Tools Source (Incubation)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Shane Clarke and others 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/incubator/\n\
-\n
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 556d966..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, jaxws32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/jaxws32.gif b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/jaxws32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/jaxws32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 798aebe..0000000
--- a/features/org.eclipse.jst.ws.jaxws.feature/sourceTemplatePlugin/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 JAXWS Core
-pluginName=JAX-WS Tools Source (Incubation)
-pluginProvider=Eclipse Web Tools Platform
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project b/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
deleted file mode 100644
index d823533..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
deleted file mode 100644
index a4a2a8c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
-
-generate.feature@org.eclipse.jst.ws.jaxws.feature.source=org.eclipse.jst.ws.jaxws.feature
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
deleted file mode 100644
index 838f1b1..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools SDK (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Source
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 Shane Clarke and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
deleted file mode 100644
index 0f2b270..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.ws.jaxws_sdk.feature"
-      label="%featureName"
-      version="0.5.2.qualifier"
-      provider-name="%featureProvider"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.jst.ws.jaxws.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.ws.jaxws.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html b/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_sdk.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/.project b/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
deleted file mode 100644
index ae2165c..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws_tests.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
deleted file mode 100644
index effd43d..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JAX-WS Tools Tests (Incubation)
-
-# "featureProvider" property - name of the company that provides the feature
-featureProvider=Eclipse Web Tools Platform
-
-# "description" property - description of the feature
-description=JAX-WS Tools Tests
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
- Copyright (c) 2009 Shane Clarke and others.\n\
- All rights reserved. This program and the accompanying materials\n\
- are made available under the terms of the Eclipse Public License v1.0\n\
- which accompanies this distribution, and is available at\n\
- http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    Shane Clarke - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=epl-v10.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml b/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
deleted file mode 100644
index 9b95003..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jst.ws.jaxws_tests.feature"
-      label="%featureName"
-      version="0.5.1.qualifier"
-      provider-name="%featureProvider"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.jst.ws.jaxws.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html b/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/features/org.eclipse.jst.ws.jaxws_tests.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.classpath b/tests/org.eclipse.jst.ws.cxf.tests/.classpath
deleted file mode 100644
index 2fbb7a2..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.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.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore b/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/.project b/tests/org.eclipse.jst.ws.cxf.tests/.project
deleted file mode 100644
index 20439ae..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.cfx.tests</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/tests/org.eclipse.jst.ws.cxf.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.cxf.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5552f02..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jan 10 09:20:54 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 83f6d75..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.ws.cfx.tests
-Bundle-Version: 0.3.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core.tests;bundle-version="0.5.0"
-Export-Package: org.eclipse.jst.ws.cfx.tests
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/about.html b/tests/org.eclipse.jst.ws.cxf.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/build.properties b/tests/org.eclipse.jst.ws.cxf.tests/build.properties
deleted file mode 100644
index 74f90d9..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/build.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               test.xml,\
-               about.html
-source.. = src/
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties b/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
deleted file mode 100644
index 6b624c2..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-#Properties file for org.eclipse.jst.ws.cfx.tests
-Bundle-Name.0 = Tests Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java
deleted file mode 100644
index c539aca..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/AllTestsSuite.java
+++ /dev/null
@@ -1,40 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.cfx.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.jaxws.core.annotation.validation.tests.JAXWSAnnotationValidationTestSuite;
-import org.eclipse.jst.ws.jaxws.core.tests.JAXWSCoreTestSuite;
-
-/**
- * This class specifies all the bundles of this component that provide a test
- * suite to run during automated testing.
- */
-public class AllTestsSuite extends TestSuite {
-
-
-	public AllTestsSuite() {
-		super("All JAXWS Test Suites");
-		addTest(JAXWSCoreTestSuite.suite());
-		addTest(JAXWSAnnotationValidationTestSuite.suite());
-	}
-
-	/**
-	 * This is just need to run in a development environment workbench.
-	 */
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-		// other than to signal to create an instance of this class.
-		// The rest it automatic from the tests added in constructor.
-
-	}
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/EasyTest.java b/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/EasyTest.java
deleted file mode 100644
index 9e4c702..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/src/org/eclipse/jst/ws/cfx/tests/EasyTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.ws.cfx.tests;
-
-import junit.framework.TestCase;
-
-public class EasyTest extends TestCase {
-
-	/**
-	 * simple test just to always succeed to demonstrate tests are being called
-	 */
-	public void testThatTestsRun() {
-		assertTrue(true);
-	}
-	
-}
diff --git a/tests/org.eclipse.jst.ws.cxf.tests/test.xml b/tests/org.eclipse.jst.ws.cxf.tests/test.xml
deleted file mode 100644
index 3ebc5ac..0000000
--- a/tests/org.eclipse.jst.ws.cxf.tests/test.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-
-    <!-- 
-         The following properties should be passed into this script
-         so we'll fail fast if not. 
-             ${eclipse-home}   
-             ${buildDirectory}
-             ${buildLabel}        
-    -->
-  
-  	<fail
-        message="Error: missing property. eclipse-home must be provided"
-        unless="eclipse-home" />
-    <fail
-        message="Error: missing property. buildDirectory must be provided"
-        unless="buildDirectory" />
-    <fail
-        message="Error: missing property. buildLabel must be provided"
-        unless="buildLabel" />
-	
-    <!-- should be little need to change what's above  -->
-	
-    <property
-        name="plugin-name"
-        value="org.eclipse.jst.ws.cfx.tests"/>
-    <property
-        name="classname"
-        value="org.eclipse.jst.ws.cfx.tests.AllTestsSuite"/>
-    <property
-        name="testType"
-        value="ui-test"/>
-
-    <!-- should be little need to change what's below -->
-    <echo
-        message="basedir: ${basedir}"/>
-    <echo
-        message="eclipse-home: ${eclipse-home}"/>
-    <echo
-        message="buildDirectory: ${buildDirectory}"/>
-    <echo
-        message="plugin-name: ${plugin-name}"/>
-    <echo
-        message="classname: ${classname}"/>
-    <echo
-        message="testType ${testType}"/>
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}"/>
-	  <echo 
-	      message="workspace: ${workspace}" />
-    <!--
-        This init target holds all initialization code that needs to be done
-        for all tests that are to be run. Initialization for individual
-        tests should be done within the body of the suite target. 
-    -->
-    <target
-        name="init">
-        <tstamp/>
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml"/>
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir
-            dir="${workspace}"/>
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true"/>
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target
-        name="suite">
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}"/>
-            <property
-                name="plugin-name"
-                value="${plugin-name}"/>
-            <property
-                name="classname"
-                value="${classname}"/>
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}"/>
-        </ant>
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt"/>
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!--
-        after all of the tests have been run. You can use this target to
-    -->
-    <!-- delete temporary files that have been created. -->
-    <target
-        name="cleanup">
-        <!--
-            usually no need to delete workspace until next run, and
-            leaving it allows inspection
-        -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-    <!--
-        This target runs the test suite. Any actions that need to happen
-    -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml"/>
-            <property
-                name="output-file"
-                value="${plugin-name}.xml"/>
-        </ant>
-    </target>
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath b/tests/org.eclipse.jst.ws.jaxws.core.tests/.classpath
deleted file mode 100644
index f930cb7..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.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/tests/org.eclipse.jst.ws.jaxws.core.tests/.project b/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
deleted file mode 100644
index cb43fcb..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.jaxws.core.tests</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/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9040021..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu May 07 15:40:23 IST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.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/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.jaxws.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 28d48ae..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/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.jaxws.core.tests
-Bundle-Version: 0.5.1.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.jaxws.core;bundle-version="0.5.0",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.ws.annotations.core;bundle-version="0.5.0",
- org.eclipse.jdt.apt.core;bundle-version="[3.3.100,4.0.0)"
-Import-Package: javax.jws,
- javax.jws.soap,
- javax.xml.ws;version="2.1.0"
-Export-Package: org.eclipse.jst.ws.jaxws.core.annotation.validation.tests,
- org.eclipse.jst.ws.jaxws.core.tests
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html b/tests/org.eclipse.jst.ws.jaxws.core.tests/about.html
deleted file mode 100644
index 5b6a031..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/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/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
deleted file mode 100644
index 9d3bc75..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               build.properties,\
-               about.html
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.jaxws.core.tests/plugin.properties
deleted file mode 100644
index bd99711..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/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 JAX-WS Tools Tests
-pluginName=JAX-WS Tools Tests (Incubation)
-providerName=Eclipse Web Tools Platform
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
deleted file mode 100644
index 387e5c1..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractAnnotationValidationTest.java
+++ /dev/null
@@ -1,32 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jst.ws.jaxws.core.tests.AbstractAnnotationTest;
-
-/**
- * 
- * @author sclarke
- *
- */
-public abstract class AbstractAnnotationValidationTest extends AbstractAnnotationTest {
-
-    @Override
-    protected boolean isAutoBuildingEnabled() {
-        return true;
-    }
-
-    @Override
-    protected boolean isAnnotationProcessingEnabled() {
-        return true;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
deleted file mode 100644
index 4a42136..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractDocumentBareValidationTest.java
+++ /dev/null
@@ -1,73 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public abstract class AbstractDocumentBareValidationTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-        
-        MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
-        MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
-        MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
-        memberValuePairs.add(styleValuePair);
-        memberValuePairs.add(useValuePair);
-        memberValuePairs.add(parameterStyleValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, javax.jws.soap.SOAPBinding.class,
-                javax.jws.soap.SOAPBinding.class.getSimpleName(), memberValuePairs);
-
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\t");
-        classContents.append("public String oneIN(String inOne, String inTwo) {\n\t\treturn \"txt\";\n\t}");
-        classContents.append("\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
deleted file mode 100644
index bfbbd54..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractOnewayValidationTest.java
+++ /dev/null
@@ -1,91 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- *
- */
-public abstract class AbstractOnewayValidationTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, Oneway.class, Oneway.class.getSimpleName(), null);
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-    
-    public abstract String getErrorMessage();
-    
-    public abstract IMethod getMethodToTest();
-    
-    public void testOnewayRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = getMethodToTest();
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, Oneway.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-            
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
deleted file mode 100644
index 9b15cd9..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebMethodPublicStaticFinalRuleTest.java
+++ /dev/null
@@ -1,104 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public abstract class AbstractWebMethodPublicStaticFinalRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(), null);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(name=\"MyClass\")\n");
-        classContents.append("public class MyClass {\n\n");
-        classContents.append("\tString myPackagePrivateMethod() {\n\t\treturn \"package-private\";\n\t}\n\n");
-        classContents.append("\tprivate String myPrivateMethod() {\n\t\treturn \"private\";\n\t}\n\n");
-        classContents.append("\tprotected String myProtectedMethod() {\n\t\tmyPrivateMethod();\n");
-        classContents.append("\t\treturn \"protected\";\n\t}\n");
-        classContents.append("\tpublic static String myStaticMethod() {\n\t\treturn \"static\";\n\t}\n\n");
-        classContents.append("\tpublic final String myFinalMethod() {\n\t\treturn \"final\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-    
-    public abstract IMethod getMethodToTeset();
-    public abstract String getErrorMessage();
-
-    public void testWebMethodRestriction() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = getMethodToTeset();
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(getErrorMessage(), annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
deleted file mode 100644
index 75e51b6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServicePublicAbstractFinalRuleTest.java
+++ /dev/null
@@ -1,109 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public abstract class AbstractWebServicePublicAbstractFinalRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
-                "MyClassPort");
-
-        MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "serviceName", "MyClassService");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "targetNamespace", "http://example.com/");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(portNameValuePair);
-        memberValuePairs.add(serviceNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(), 
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebServicePublicAbstractFinalRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils
-                    .addImportChange(compilationUnit, WebService.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_PUBLIC_ABSTRACT_FINAL,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
deleted file mode 100644
index 86bbeb5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/AbstractWebServiceSEIRule.java
+++ /dev/null
@@ -1,62 +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.jaxws.core.annotation.validation.tests;
-
-/**
- * 
- * @author sclarke
- *
- */
-public abstract class AbstractWebServiceSEIRule extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        testJavaProject.createCompilationUnit(getPackageName(), getInterfaceName(), getInterfaceContents());
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(endpointInterface=\"com.example.MyInterface\", ");
-        classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
-        classContents.append("serviceName=\"MyClassService\")\n");
-        classContents.append("public class MyClass {\n\n");
-        classContents.append("\tpublic void methodOne(String in) {\n\t}\n\n");
-        classContents.append("\tpublic String myMethod(String in) {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-    
-    private String getInterfaceContents() {
-        StringBuilder seiContents = new StringBuilder("package com.example;\n\n");
-        seiContents.append("import javax.jws.WebService;\n\n");
-        seiContents.append("@WebService(name=\"MyInterface\", targetNamespace=\"http://example.com/\")\n");
-        seiContents.append("public interface MyInterface {\n\n");
-        seiContents.append("\tpublic String myMethod(String in);\n\n}");
-        return seiContents.toString();
-    }
-    
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    protected String getInterfaceName() {
-        return "MyInterface.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.java
deleted file mode 100644
index 8749667..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareNonVoidNoOutParametersRuleTest.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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class DocBareNonVoidNoOutParametersRuleTest extends AbstractDocumentBareValidationTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebParam;\n");
-        classContents.append("public class MyClass {\n\n\t");
-        classContents.append("public String noOut(String in, @WebParam(name=\"out\", mode=WebParam.Mode.OUT) ");
-        classContents.append("String out) {\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    public void testNonVoidNoOUTParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("noOut", new String[] { "QString;",
-                    "QString; "});
-            
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class,
-                    textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_NON_VOID_RETURN_NO_INOUT_OUT_PARAMETER,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
deleted file mode 100644
index dc8cc80..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareOneNonHeaderINParameterRuleTest.java
+++ /dev/null
@@ -1,169 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class DocBareOneNonHeaderINParameterRuleTest extends AbstractDocumentBareValidationTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebParam;\n\n");
-        classContents.append("public class MyClass {\n\n\t");
-        //classContents.append("public String oneIN() {\n\t\treturn \"txt\";\n\t}\n\n\t");
-        classContents.append("public String oneMore(@WebParam(name=\"inOne\", mode=WebParam.Mode.IN) String ");
-        classContents.append("inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN)String inTwo) {\n\t\t");
-        classContents.append("return \"txt\";\n\t}\n\n\tpublic String onlyOneIN(String inOne, String inTwo) {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
-        return classContents.toString();
-    }
-
-    /*
-    public void testOneNonHeaderINParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals("SOAPBinding", AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("oneIN", new String[0]);
-            assertNotNull(method);
-
-            AnnotationUtils.getImportChange(compilationUnit, javax.jws.soap.SOAPBinding.class,
-                    textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_ONE_NON_HEADER_IN_PARAMETER_ERROR_MESSAGE,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }*/
-
-    public void testOnlyOneNonHeaderINParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("onlyOneIN", new String[] { "QString;", 
-                    "QString;" });
-            
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-    
-    public void testOnlyOneNonHeaderINParameterWithWebParamsRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("oneMore", new String[] { "QString;", 
-                    "QString;" });
-            
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_ONLY_ONE_NON_HEADER_IN_PARAMETER,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
deleted file mode 100644
index 354c801..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/DocBareVoidOneINOneOutParameterRuleTest.java
+++ /dev/null
@@ -1,129 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class DocBareVoidOneINOneOutParameterRuleTest extends AbstractDocumentBareValidationTest {
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebParam;\n");
-        classContents.append("import javax.xml.ws.Holder;\n\n");
-        classContents.append("public class MyClass {\n\n\t");
-        classContents.append("public void oneIn(@WebParam(name=\"inOne\", mode=WebParam.Mode.INOUT) ");
-        classContents.append("Holder<String> inOne, @WebParam(name=\"inTwo\", mode=WebParam.Mode.IN) ");
-        classContents.append("String inTwo) {\n\n\t}\n\n\t");
-        classContents.append("public void oneOut(@WebParam(name=\"outOne\", mode=WebParam.Mode.INOUT) ");
-        classContents.append("Holder<String> outOne, @WebParam(name=\"outTwo\", mode=WebParam.Mode.OUT) ");
-        classContents.append("Holder<String> outTwo) {\n\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    public void testVoidOneInParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("oneIn", new String[] { "QHolder<QString;>;",
-                    "QString;"});
-            
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_IN_PARAMETER,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-    public void testVoidOneOutParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("oneOut", new String[] { "QHolder<QString;>;",
-                    "QHolder<QString;>;"});
-            
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-            
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.DOC_BARE_VOID_RETURN_ONE_OUT_PARAMETER,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
deleted file mode 100644
index e813d28..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/HolderTypeParameterRuleTest.java
+++ /dev/null
@@ -1,95 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class HolderTypeParameterRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(), null);
-    }
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebParam;\n");
-        classContents.append("import javax.xml.ws.Holder;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
-        classContents.append("@WebParam(mode=WebParam.Mode.IN) Holder<java.lang.String> param) {\n\n\t}\n}");
-        return classContents.toString();
-    }
-
-    public void testHolderTypeParameterRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-            
-            AnnotationUtils.addImportChange(compilationUnit, WebService.class, textFileChange,
-                    true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.HOLDER_TYPE_MUST_BE_OUT_INOUT,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
deleted file mode 100644
index 4b4ab2d..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/JAXWSAnnotationValidationTestSuite.java
+++ /dev/null
@@ -1,62 +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.jaxws.core.annotation.validation.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class JAXWSAnnotationValidationTestSuite extends TestSuite {
-
-    public static Test suite() {
-        return new JAXWSAnnotationValidationTestSuite();
-    }
-
-    public JAXWSAnnotationValidationTestSuite() {
-        super("JAX-WS Annotation Validation Tests");
-        addTestSuite(DocBareNonVoidNoOutParametersRuleTest.class);
-        addTestSuite(DocBareOneNonHeaderINParameterRuleTest.class);
-        addTestSuite(DocBareVoidOneINOneOutParameterRuleTest.class);
-        addTestSuite(OnewayNoReturnValueRuleTest.class);
-        addTestSuite(OnewayNoCheckedExceptionsRuleTest.class);
-        addTestSuite(HolderTypeParameterRuleTest.class);
-        addTestSuite(OnewayNoHolderParametersRuleTest.class);
-        addTestSuite(SOAPBindingMethodStyleDocumentRuleTest.class);
-        addTestSuite(SOAPBindingMethodUseRuleTest.class);
-        addTestSuite(WebMethodCheckForWebServiceRuleTest.class);
-        addTestSuite(WebMethodExcludeRuleOnSEITest.class);
-        addTestSuite(WebMethodExcludeRuleOnImplTest.class);
-        addTestSuite(WebMethodNoPackagePrivateMethodRuleTest.class);
-        addTestSuite(WebMethodNoPrivateMethodRuleTest.class);
-        addTestSuite(WebMethodNoProtectedMethodRuleTest.class);
-        addTestSuite(WebMethodNoFinalModifierRuleTest.class);
-        addTestSuite(WebMethodNoStaticModifierRuleTest.class);
-        addTestSuite(WebParamModeHolderTypeRuleTest.class);
-        addTestSuite(WebServiceDefaultPublicConstructorRuleTest.class);
-        addTestSuite(WebServiceNoFinalizeMethodRuleTest.class);
-        addTestSuite(WebServiceNoFinalModiferRuleTest.class);
-        addTestSuite(WebServiceNoAbstractModifierRuleTest.class);
-        addTestSuite(WebServiceSEINoServiceNameRuleTest.class);
-        addTestSuite(WebServiceSEINoEndpointInterfaceRuleTest.class);
-        addTestSuite(WebServiceSEINoPortNameRuleTest.class);
-        addTestSuite(WebServiceSEINoWebMethodRuleTest.class);
-        addTestSuite(WebServiceSEINoWebResultRuleTest.class);
-        addTestSuite(WebServiceSEINoWebParamRuleTest.class);
-        addTestSuite(WebServiceSEINoOnewayRuleTest.class);
-        addTestSuite(WebServiceSEINoSOAPBindingRuleTest.class);
-        addTestSuite(WebServiceWebServiceProviderCoExistRuleTest.class);
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
deleted file mode 100644
index 04aa6d6..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoCheckedExceptionsRuleTest.java
+++ /dev/null
@@ -1,40 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class OnewayNoCheckedExceptionsRuleTest extends AbstractOnewayValidationTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic void myMethod(int i) throws Exception {\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.ONEWAY_NO_CHECKED_EXCEPTIONS;
-    }
-
-    @Override
-    public IMethod getMethodToTest() {
-        return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
deleted file mode 100644
index c38c3af..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoHolderParametersRuleTest.java
+++ /dev/null
@@ -1,42 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class OnewayNoHolderParametersRuleTest extends AbstractOnewayValidationTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.xml.ws.Holder;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic void myMethod(");
-        classContents.append("Holder<String> in) {\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.ONEWAY_NO_HOLDER_PARAMETERS;
-    }
-
-    @Override
-    public IMethod getMethodToTest() {
-        return source.findPrimaryType().getMethod("myMethod", new String[]{"QHolder<QString;>;"});
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
deleted file mode 100644
index 6fe417f..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/OnewayNoReturnValueRuleTest.java
+++ /dev/null
@@ -1,39 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class OnewayNoReturnValueRuleTest extends AbstractOnewayValidationTest {
-
-	@Override
-	public String getClassContents() {
-	    StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-	    classContents.append("public class MyClass {\n\n\tpublic int myMethod(int i) {\n\t\treturn 0;\n\t}\n}");
-        return classContents.toString();
-	}
-
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.ONEWAY_NO_RETURN_VALUE;
-    }
-
-    @Override
-    public IMethod getMethodToTest() {
-        return source.findPrimaryType().getMethod("myMethod", new String[]{"I"});
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodStyleDocumentRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodStyleDocumentRuleTest.java
deleted file mode 100644
index 843d78a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodStyleDocumentRuleTest.java
+++ /dev/null
@@ -1,120 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class SOAPBindingMethodStyleDocumentRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "style", Style.RPC);
-
-        MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "use", Use.LITERAL);
-
-        MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.WRAPPED);
-
-        memberValuePairs.add(styleValuePair);
-        memberValuePairs.add(useValuePair);
-        memberValuePairs.add(parameterStyleValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, SOAPBinding.class, SOAPBinding.class.getSimpleName(), 
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testSOAPBindingMethodStyleDocumentRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.SOAPBINDING_ON_METHOD_STYLE_DOCUMENT_ONLY,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodUseRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodUseRuleTest.java
deleted file mode 100644
index 6fbfb70..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/SOAPBindingMethodUseRuleTest.java
+++ /dev/null
@@ -1,119 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.jws.soap.SOAPBinding.Use;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class SOAPBindingMethodUseRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair styleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "style", Style.DOCUMENT);
-
-        MemberValuePair useValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "use", Use.ENCODED);
-
-        MemberValuePair parameterStyleValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                SOAPBinding.class.getCanonicalName(), "parameterStyle", ParameterStyle.BARE);
-
-        memberValuePairs.add(styleValuePair);
-        memberValuePairs.add(useValuePair);
-        memberValuePairs.add(parameterStyleValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, SOAPBinding.class, SOAPBinding.class.getSimpleName(), 
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic String myMethod(String in) {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testSOAPBindingMethodUseRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-            
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.SOAPBINDING_NO_PARAMETERSTYLE_WHEN_ENCODED,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
deleted file mode 100644
index ee575d0..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodCheckForWebServiceRuleTest.java
+++ /dev/null
@@ -1,112 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebMethodCheckForWebServiceRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "operationName", "myMethod");
-
-        MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
-                "urn:MyMethod");
-
-        memberValuePairs.add(operationValuePair);
-        memberValuePairs.add(actionValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebMethodCheckForWebServiceRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBMETHOD_ONLY_SUPPORTED_ON_CLASSES_WITH_WEBSERVICE,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
deleted file mode 100644
index 4eea834..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnImplTest.java
+++ /dev/null
@@ -1,118 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebMethodExcludeRuleOnImplTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "operationName", "myMethod");
-
-        MemberValuePair actionValuePair = AnnotationsCore.createStringMemberValuePair(ast, "action",
-                "urn:MyMethod");
-
-        MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
-                Boolean.TRUE);
-
-        memberValuePairs.add(operationValuePair);
-        memberValuePairs.add(actionValuePair);
-        memberValuePairs.add(excludeValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(name=\"MyClass\")\n");
-        classContents.append("public class MyClass {\n\n\tpublic String myMethod() {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebMethodCheckForWebServiceRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_SPECIFIED_NO_OTHER_ATTRIBUTES_ALLOWED,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
deleted file mode 100644
index 38c1f41..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodExcludeRuleOnSEITest.java
+++ /dev/null
@@ -1,110 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebMethodExcludeRuleOnSEITest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair excludeValuePair = AnnotationsCore.createBooleanMemberValuePair(ast, "exclude",
-                Boolean.TRUE);
-
-        memberValuePairs.add(excludeValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(name=\"MyInterface\")\n");
-        classContents.append("public interface MyClass {\n\n\tpublic String myMethod();\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebMethodExcludeRuleOnInterface() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[0]);
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBMETHOD_EXCLUDE_NOT_ALLOWED_ON_SEI,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
deleted file mode 100644
index 1e3cd7e..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoFinalModifierRuleTest.java
+++ /dev/null
@@ -1,33 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodNoFinalModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
-    @Override
-    public IMethod getMethodToTeset() {
-        return source.findPrimaryType().getMethod("myFinalMethod", new String[0]);
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.WEBMETHOD_NO_FINAL_MODIFIER_ALLOWED;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
deleted file mode 100644
index f5c05c3..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPackagePrivateMethodRuleTest.java
+++ /dev/null
@@ -1,33 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodNoPackagePrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
-    @Override
-    public IMethod getMethodToTeset() {
-        return source.findPrimaryType().getMethod("myPackagePrivateMethod", new String[0]);
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
deleted file mode 100644
index 137a015..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoPrivateMethodRuleTest.java
+++ /dev/null
@@ -1,33 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodNoPrivateMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
-    @Override
-    public IMethod getMethodToTeset() {
-        return source.findPrimaryType().getMethod("myPrivateMethod", new String[0]);
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
deleted file mode 100644
index 03394c8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoProtectedMethodRuleTest.java
+++ /dev/null
@@ -1,33 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodNoProtectedMethodRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
-    @Override
-    public IMethod getMethodToTeset() {
-        return source.findPrimaryType().getMethod("myProtectedMethod", new String[0]);
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.WEBMETHOD_ONLY_ON_PUBLIC_METHODS;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
deleted file mode 100644
index 06f28cd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebMethodNoStaticModifierRuleTest.java
+++ /dev/null
@@ -1,33 +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.jaxws.core.annotation.validation.tests;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebMethodNoStaticModifierRuleTest extends AbstractWebMethodPublicStaticFinalRuleTest {
-
-    @Override
-    public IMethod getMethodToTeset() {
-        return source.findPrimaryType().getMethod("myStaticMethod", new String[0]);
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return JAXWSCoreMessages.WEBMETHOD_NO_STATIC_MODIFIER_ALLOWED;
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
deleted file mode 100644
index e5af338..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebParamModeHolderTypeRuleTest.java
+++ /dev/null
@@ -1,118 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-import javax.jws.WebParam.Mode;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebParamModeHolderTypeRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    public Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair modeValuePair = AnnotationsCore.createEnumMemberValuePair(ast,
-                WebParam.class.getCanonicalName(), "mode", Mode.OUT);
-
-        memberValuePairs.add(modeValuePair);
-        
-        return AnnotationsCore.createAnnotation(ast, WebParam.class, WebParam.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(name=\"MyClass\")\n");
-        classContents.append("public class MyClass {\n\n\tpublic String myMethod(String param) {");
-        classContents.append("\n\t\treturn \"txt\";\n\t}\n}");
-        return classContents.toString();
-    }
-
-    public void testWebParamModeHolderTypeRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-            
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebParam.class, textFileChange, true);
-
-            SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
-                    128);
-
-            AnnotationUtils.createMethodParameterAnnotationChange(source, compilationUnit, rewriter,
-                    parameter, method, annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            // refresh
-            parameter = AnnotationUtils.getMethodParameter(AnnotationUtils.getASTParser(method
-                    .getCompilationUnit()), method, 156);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-            
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBPARAM_MODE_OUT_INOUT_HOLDER_TYPE,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
deleted file mode 100644
index 1df5a93..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceDefaultPublicConstructorRuleTest.java
+++ /dev/null
@@ -1,116 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceDefaultPublicConstructorRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
-                "MyClassPort");
-
-        MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "serviceName", "MyClassService");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "targetNamespace", "http://example.com/");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(portNameValuePair);
-        memberValuePairs.add(serviceNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic MyClass(String arg) {\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebServiceDefaultPublicConstructorRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils
-                    .addImportChange(compilationUnit, WebService.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_DEFAULT_PUBLIC_CONSTRUCTOR,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
deleted file mode 100644
index 2dae1e4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoAbstractModifierRuleTest.java
+++ /dev/null
@@ -1,28 +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.jaxws.core.annotation.validation.tests;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceNoAbstractModifierRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public abstract class MyClass {\n\n");
-        classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
deleted file mode 100644
index 94081ad..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalModiferRuleTest.java
+++ /dev/null
@@ -1,28 +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.jaxws.core.annotation.validation.tests;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceNoFinalModiferRuleTest extends AbstractWebServicePublicAbstractFinalRuleTest {
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public final class MyClass {\n\n");
-        classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
deleted file mode 100644
index 84ed272..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceNoFinalizeMethodRuleTest.java
+++ /dev/null
@@ -1,116 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceNoFinalizeMethodRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
-                "MyClassPort");
-
-        MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "serviceName", "MyClassService");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "targetNamespace", "http://example.com/");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(portNameValuePair);
-        memberValuePairs.add(serviceNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class MyClass {\n\n\tpublic void finalize() {\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebServiceNoFinalizeMethodRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils
-                    .addImportChange(compilationUnit, WebService.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_OVERRIDE_FINALIZE,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
deleted file mode 100644
index 741e971..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoEndpointInterfaceRuleTest.java
+++ /dev/null
@@ -1,112 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceSEINoEndpointInterfaceRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair endpointInterfaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "endpointInterface", "MyInterface");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                "targetNamespace", "http://example.com/");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(endpointInterfaceValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyInterface.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-    
-    public void testWebServiceSEINoEndpointInterfaceRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, WebService.class, textFileChange,
-                    true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENDPOINTINTERFACE_SEI,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
deleted file mode 100644
index 6f4940a..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoOnewayRuleTest.java
+++ /dev/null
@@ -1,79 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.Oneway;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoOnewayRuleTest extends AbstractWebServiceSEIRule {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, Oneway.class, Oneway.class.getSimpleName(), null);
-    }
-
-    public void testWebServiceSEIPresentNoOnewayRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(Oneway.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, Oneway.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_ONEWAY,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
deleted file mode 100644
index 3548810..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoPortNameRuleTest.java
+++ /dev/null
@@ -1,111 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class WebServiceSEINoPortNameRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast, 
-                "targetNamespace", "http://example.com/");
-
-        MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName", 
-        "MyClassPort");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(portNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyInterface.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-    
-    public void testWebServiceSEINoPortNameRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, WebService.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_PORTNAME_SEI,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
deleted file mode 100644
index cd53fac..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoSOAPBindingRuleTest.java
+++ /dev/null
@@ -1,118 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoSOAPBindingRuleTest extends AbstractWebServiceSEIRule {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, SOAPBinding.class, SOAPBinding.class.getSimpleName(), null);
-    }
-
-    public void testNoSOAPBindingOnMethodRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-    public void testNoSOAPBindingOnTypeRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(SOAPBinding.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, SOAPBinding.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_SOAPBINDING,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-    
-    
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
deleted file mode 100644
index 8e6c4b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoServiceNameRuleTest.java
+++ /dev/null
@@ -1,111 +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.jaxws.core.annotation.validation.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoServiceNameRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "MyClass");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "targetNamespace", "http://example.com/");
-
-        MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "serviceName", "MyClassService");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(serviceNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public interface MyInterface {\n\n\tpublic String myeMethod();\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyInterface.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebServiceSEINoServiceNameRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, WebService.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_SERVICENAME_SEI,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
deleted file mode 100644
index babf7ed..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebMethodRuleTest.java
+++ /dev/null
@@ -1,79 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoWebMethodRuleTest extends AbstractWebServiceSEIRule {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(), null);
-    }
-
-    public void testWebServiceSEIPresentNoWebMethodRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHODS,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
deleted file mode 100644
index 5196644..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebParamRuleTest.java
+++ /dev/null
@@ -1,85 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoWebParamRuleTest extends AbstractWebServiceSEIRule {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebParam.class, WebParam.class.getSimpleName(), null);
-    }
-
-    public void testWebServiceSEIPresentNoWebParamRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("methodOne", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebParam.class, textFileChange, true);
-
-            SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
-                    250);
-
-            AnnotationUtils.createMethodParameterAnnotationChange(source, compilationUnit, rewriter,
-                    parameter, method, annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            // refresh
-            parameter = AnnotationUtils.getMethodParameter(AnnotationUtils.getASTParser(method
-                    .getCompilationUnit()), method, 278);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-            
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBPARAM,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
deleted file mode 100644
index 0515563..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceSEINoWebResultRuleTest.java
+++ /dev/null
@@ -1,78 +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.jaxws.core.annotation.validation.tests;
-
-import javax.jws.WebResult;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceSEINoWebResultRuleTest extends AbstractWebServiceSEIRule {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebResult.class, WebResult.class.getSimpleName(), null);
-    }
-
-    public void testWebServiceSEIPresentNoWebResultRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebResult.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("myMethod", new String[] { "QString;" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebResult.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_ENPOINTINTERFACE_NO_WEBRESULT,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
deleted file mode 100644
index 2fb1fa5..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/annotation/validation/tests/WebServiceWebServiceProviderCoExistRuleTest.java
+++ /dev/null
@@ -1,97 +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.jaxws.core.annotation.validation.tests;
-
-import javax.xml.ws.WebServiceProvider;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.internal.jaxws.core.JAXWSCoreMessages;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class WebServiceWebServiceProviderCoExistRuleTest extends AbstractAnnotationValidationTest {
-
-    @Override
-    protected Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebServiceProvider.class,
-                WebServiceProvider.class.getSimpleName(), null);
-    }
-
-    @Override
-    protected String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(targetNamespace=\"http://example.com/\", portName=\"MyClassPort\",");
-        classContents.append(" serviceName=\"MyClassService\")\n");
-        classContents.append("public class MyClass {\n\n");
-        classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    protected String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    protected String getPackageName() {
-        return "com.example";
-    }
-
-    public void testWebServiceWebServiceProviderCoExistRule() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebServiceProvider.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, WebServiceProvider.class, textFileChange, true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter,
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-
-            IMarker[] allmarkers = source.getResource().findMarkers(IMarker.PROBLEM, true,
-                    IResource.DEPTH_INFINITE);
-
-            assertEquals(1, allmarkers.length);
-
-            IMarker annotationProblemMarker = allmarkers[0];
-
-            assertEquals(source.getResource(), annotationProblemMarker.getResource());
-            assertEquals(JAXWSCoreMessages.WEBSERVICE_WEBSERVICEPROVIDER_COMBINATION,
-                    annotationProblemMarker.getAttribute(IMarker.MESSAGE));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        } catch (OperationCanceledException oce) {
-            fail(oce.getLocalizedMessage());
-        } catch (InterruptedException ie) {
-            fail(ie.getLocalizedMessage());
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
deleted file mode 100644
index 67ee15c..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AbstractAnnotationTest.java
+++ /dev/null
@@ -1,91 +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.jaxws.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.PerformChangeOperation;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-
-/**
- * 
- * @author sclarke
- *
- */
-public abstract class AbstractAnnotationTest extends TestCase {
-    protected TestJavaProject testJavaProject;
-    protected ICompilationUnit source;
-    protected CompilationUnit compilationUnit;
-    protected AST ast;
-    protected ASTRewrite rewriter;
-    protected Annotation annotation;
-    protected TextFileChange textFileChange;
-    
-    @Override
-    protected void setUp() throws Exception {
-        testJavaProject = new TestJavaProject("JavaProject");
-        testJavaProject.setAutoBuilding(isAutoBuildingEnabled());
-        testJavaProject.enableAnnotationProcessing(isAnnotationProcessingEnabled());
-
-        source = testJavaProject.createCompilationUnit(getPackageName(), getClassName(), getClassContents());
-
-        compilationUnit = AnnotationUtils.getASTParser(source);
-        ast = compilationUnit.getAST();
-        rewriter = ASTRewrite.create(ast);
-        annotation = getAnnotation();
-        textFileChange = AnnotationUtils.createTextFileChange("AC", (IFile) source.getResource());
-    }
-    
-    protected boolean isAutoBuildingEnabled() {
-        return false;
-    }
-
-    protected boolean isAnnotationProcessingEnabled() {
-        return false;
-    }
-
-    protected abstract String getPackageName();
-    protected abstract String getClassName();
-    protected abstract String getClassContents();
-    protected abstract Annotation getAnnotation();
-    
-    protected boolean executeChange(IProgressMonitor monitor, Change change) {
-        if (change == null) {
-            return false;
-        }
-
-        change.initializeValidationData(monitor);
-
-        PerformChangeOperation changeOperation = new PerformChangeOperation(change);
-
-        try {
-            changeOperation.run(monitor);
-        } catch (CoreException ce) {
-            ce.printStackTrace();
-        }
-        return changeOperation.changeExecuted();
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        testJavaProject.getProject().delete(true, true, null);
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java
deleted file mode 100644
index 3c87951..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToFieldTest.java
+++ /dev/null
@@ -1,83 +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.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class AddAnnotationToFieldTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        return "package com.example;\n\npublic class MyClass {\n\n\tstatic String service;\n\n}";
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair wsdlLocationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "wsdlLocation", "http://localhost:8083/ServiceProject/servives/MyService?WSDL");
-
-        memberValuePairs.add(wsdlLocationValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebServiceRef.class, WebServiceRef.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    public void testAddAnnotationToField() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IField field = source.findPrimaryType().getField("service");
-            assertNotNull(field);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebServiceRef.class, textFileChange, true);
-
-            AnnotationUtils.createFieldAnnotationChange(source, compilationUnit, rewriter, field, annotation,
-                    textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
deleted file mode 100644
index 6a335b8..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodParameterTest.java
+++ /dev/null
@@ -1,91 +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.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class AddAnnotationToMethodParameterTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "Calculator.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
-        classContents.append("\n\t\treturn i + k;\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "name", "i");
-
-        memberValuePairs.add(nameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebParam.class, WebParam.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    public void testAddAnnotationToMethodParameter() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebParam.class, textFileChange, true);
-
-            SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
-                    65);
-
-            AnnotationUtils.createMethodParameterAnnotationChange(source, compilationUnit, rewriter,
-                    parameter, method, annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            // refresh
-            parameter = AnnotationUtils.getMethodParameter(AnnotationUtils.getASTParser(method
-                    .getCompilationUnit()), method, 93);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
deleted file mode 100644
index fc50bdd..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToMethodTest.java
+++ /dev/null
@@ -1,85 +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.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class AddAnnotationToMethodTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "Calculator.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
-        classContents.append("\n\t\treturn i + k;\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair operationValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "operationName", "add");
-
-        memberValuePairs.add(operationValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    public void testAddAnnotationToMethod() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
-            assertNotNull(method);
-
-            AnnotationUtils.addImportChange(compilationUnit, WebMethod.class, textFileChange, true);
-
-            AnnotationUtils.createMethodAnnotationChange(source, compilationUnit, rewriter, method,
-                    annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
deleted file mode 100644
index 922d726..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/AddAnnotationToTypeTest.java
+++ /dev/null
@@ -1,95 +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.jaxws.core.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.MemberValuePair;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-import org.eclipse.jst.ws.jaxws.core.utils.JDTUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class AddAnnotationToTypeTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "Calculator.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("public class Calculator {\n\n\tpublic int add(int i, int k) {");
-        classContents.append("\n\t\treturn i + k;\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        List<MemberValuePair> memberValuePairs = new ArrayList<MemberValuePair>();
-
-        MemberValuePair nameValuePair = AnnotationsCore
-                .createStringMemberValuePair(ast, "name", "Calculator");
-
-        MemberValuePair targetNamespaceValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "targetNamespace", JDTUtils.getTargetNamespaceFromPackageName(getPackageName()));
-
-        MemberValuePair portNameValuePair = AnnotationsCore.createStringMemberValuePair(ast, "portName",
-                "CalculatorPort");
-
-        MemberValuePair serviceNameValuePair = AnnotationsCore.createStringMemberValuePair(ast,
-                "serviceName", "CalculatorService");
-
-        memberValuePairs.add(nameValuePair);
-        memberValuePairs.add(targetNamespaceValuePair);
-        memberValuePairs.add(portNameValuePair);
-        memberValuePairs.add(serviceNameValuePair);
-
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(),
-                memberValuePairs);
-    }
-
-    public void testAddAnnotationToType() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            AnnotationUtils.addImportChange(compilationUnit, WebService.class, textFileChange,
-                    true);
-
-            AnnotationUtils.createTypeAnnotationChange(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
deleted file mode 100644
index 4a88368..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/JAXWSCoreTestSuite.java
+++ /dev/null
@@ -1,39 +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.jaxws.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class JAXWSCoreTestSuite extends TestSuite {
-
-    public static Test suite() {
-        return new JAXWSCoreTestSuite();
-    }
-    
-    public JAXWSCoreTestSuite() {
-        super("JAX-WS Core Tests");
-        addTestSuite(AddAnnotationToTypeTest.class);
-        addTestSuite(RemoveAnnotationFromTypeTest.class);
-        addTestSuite(AddAnnotationToFieldTest.class);
-        addTestSuite(RemoveAnnotationFromFieldTest.class);
-        addTestSuite(AddAnnotationToMethodTest.class);
-        addTestSuite(RemoveAnnotationFromMethodTest.class);
-        addTestSuite(AddAnnotationToMethodParameterTest.class);
-        addTestSuite(RemoveAnnotationFromMethodParameterTest.class);        
-    }
-    
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
deleted file mode 100644
index 5354051..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromFieldTest.java
+++ /dev/null
@@ -1,75 +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.jaxws.core.tests;
-
-import javax.xml.ws.WebServiceRef;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class RemoveAnnotationFromFieldTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.xml.ws.WebServiceRef;\n\n");
-        classContents.append("public class MyClass {\n\n\t@WebServiceRef()\n\tstatic String service;\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebServiceRef.class, WebServiceRef.class.getSimpleName(),
-                null);
-    }
-
-    public void testRemoveAnnotationFromField() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebServiceRef.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IField field = source.findPrimaryType().getField("service");
-            assertNotNull(field);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            AnnotationUtils.removeAnnotationFromField(source, compilationUnit, rewriter, field, annotation,
-                    textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertFalse(AnnotationUtils.isAnnotationPresent(field, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
deleted file mode 100644
index 402eb92..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodParameterTest.java
+++ /dev/null
@@ -1,81 +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.jaxws.core.tests;
-
-import javax.jws.WebParam;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class RemoveAnnotationFromMethodParameterTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "Calculator.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebParam;\n\n");
-        classContents.append("public class Calculator {\n\n\tpublic int add(@WebParam(name=\"i\")");
-        classContents.append("int i, int k) {\n\t\treturn i + k;\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebParam.class, WebParam.class.getSimpleName(), null);
-    }
-
-    public void testRemoveAnnotationFromMethodParameter() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebParam.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
-            assertNotNull(method);
-
-            SingleVariableDeclaration parameter = AnnotationUtils.getMethodParameter(compilationUnit, method,
-                    93);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-
-            AnnotationUtils.removeAnnotationFromMethodParameter(source, rewriter, parameter, annotation,
-                    textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            // refresh
-            parameter = AnnotationUtils.getMethodParameter(AnnotationUtils.getASTParser(method
-                    .getCompilationUnit()), method, 93);
-
-            assertFalse(AnnotationUtils.isAnnotationPresent(parameter, annotation));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
deleted file mode 100644
index ac0e493..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromMethodTest.java
+++ /dev/null
@@ -1,75 +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.jaxws.core.tests;
-
-import javax.jws.WebMethod;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class RemoveAnnotationFromMethodTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "Calculator.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebMethod;\n\n");
-        classContents.append("public class Calculator {\n\n\t@WebMethod\n\tpublic int add(int i, int k) {");
-        classContents.append("\n\t\treturn i + k;\n\t}\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebMethod.class, WebMethod.class.getSimpleName(), null);
-    }
-
-    public void testRemoveAnnotationFromMethod() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebMethod.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            IMethod method = source.findPrimaryType().getMethod("add", new String[] { "I", "I" });
-            assertNotNull(method);
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            AnnotationUtils.removeAnnotationFromMethod(source, compilationUnit, rewriter, method, annotation,
-                    textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertFalse(AnnotationUtils.isAnnotationPresent(method, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
deleted file mode 100644
index e5413ae..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/RemoveAnnotationFromTypeTest.java
+++ /dev/null
@@ -1,74 +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.jaxws.core.tests;
-
-import javax.jws.WebService;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.dom.Annotation;
-import org.eclipse.jst.ws.annotations.core.AnnotationsCore;
-import org.eclipse.jst.ws.annotations.core.utils.AnnotationUtils;
-
-/**
- * 
- * @author sclarke
- * 
- */
-public class RemoveAnnotationFromTypeTest extends AbstractAnnotationTest {
-
-    @Override
-    public String getPackageName() {
-        return "com.example";
-    }
-
-    @Override
-    public String getClassName() {
-        return "MyClass.java";
-    }
-
-    @Override
-    public String getClassContents() {
-        StringBuilder classContents = new StringBuilder("package com.example;\n\n");
-        classContents.append("import javax.jws.WebService;\n\n");
-        classContents.append("@WebService(name=\"MyClass\", endpointInterface=\"MyInterface\", ");
-        classContents.append("targetNamespace=\"http://example.com/\", portName=\"MyClassPort\", ");
-        classContents.append("serviceName=\"MyClassService\")\n");
-        classContents.append("public class MyClass {\n\n");
-        classContents.append("\tpublic String myMethod() {" + "\n\t\treturn \"txt\";\n\t}\n\n}");
-        return classContents.toString();
-    }
-
-    @Override
-    public Annotation getAnnotation() {
-        return AnnotationsCore.createAnnotation(ast, WebService.class, WebService.class.getSimpleName(), null);
-    }
-
-    public void testRemoveAnnotationFromType() {
-        try {
-            assertNotNull(annotation);
-            assertEquals(WebService.class.getSimpleName(), AnnotationUtils.getAnnotationName(annotation));
-
-            assertTrue(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-
-            AnnotationUtils.removeAnnotationFromType(source, compilationUnit, rewriter, 
-                    source.findPrimaryType(), annotation, textFileChange);
-
-            assertTrue(executeChange(new NullProgressMonitor(), textFileChange));
-
-            assertFalse(AnnotationUtils.isAnnotationPresent(source, AnnotationUtils
-                    .getAnnotationName(annotation)));
-        } catch (CoreException ce) {
-            fail(ce.getLocalizedMessage());
-        }
-    }
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
deleted file mode 100644
index cd2d6a2..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestJavaProject.java
+++ /dev/null
@@ -1,132 +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.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.apt.core.util.AptConfig;
-import org.eclipse.jdt.core.IClasspathEntry;
-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.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class TestJavaProject extends TestProject {
-    private IJavaProject javaProject;
-    
-    public TestJavaProject(String projectName) throws CoreException {
-        super(projectName);
-        javaProject = JavaCore.create(getProject());
-        addProjectNature(getProject(), JavaCore.NATURE_ID);
-
-        javaProject.setRawClasspath(new IClasspathEntry[0], null);
-
-        createSourceFolder();
-        addToClasspath(javaProject, getJREContainerEntry());
-        createOutputFolder();
-    }
-    
-    public void setAutoBuilding(boolean autoBuild) throws CoreException {
-        IWorkspaceDescription description = ResourcesPlugin.getWorkspace().getDescription();
-        description.setAutoBuilding(autoBuild);
-        ResourcesPlugin.getWorkspace().setDescription(description);
-    }
-    
-    public void enableAnnotationProcessing(boolean enable) {
-        AptConfig.setEnabled(javaProject, enable);
-    }
-    
-    private IClasspathEntry getJREContainerEntry() {
-        IVMInstall defaultVMInstall = JavaRuntime.getDefaultVMInstall();
-        if (defaultVMInstall != null && isJava6OrGreaterJRE(defaultVMInstall)) {
-            return JavaRuntime.getDefaultJREContainerEntry();
-        }
-        
-        IVMInstallType[] installTypes = JavaRuntime.getVMInstallTypes();
-        for (IVMInstallType installType : installTypes) {
-            IVMInstall[] vmInstalls = installType.getVMInstalls();
-            for (IVMInstall vmInstall : vmInstalls) {
-                if (isJava6OrGreaterJRE(vmInstall)) {
-                    return JavaCore.newContainerEntry(JavaRuntime.newJREContainerPath(installType.getId(),
-                            vmInstall.getName()));
-                }
-            }
-        }
-        
-        return JavaRuntime.getDefaultJREContainerEntry();
-    }
-    
-    private boolean isJava6OrGreaterJRE(IVMInstall vmInstall) {
-        if (vmInstall instanceof IVMInstall2) {
-            IVMInstall2 vmInstall2 = (IVMInstall2) vmInstall;
-            if (vmInstall2.getJavaVersion().compareTo(JavaCore.VERSION_1_6) > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public ICompilationUnit createCompilationUnit(String packageName, String name, String contents) throws JavaModelException {
-        return getPackageFragment(packageName).createCompilationUnit(name, contents, false, monitor);
-    }
-    
-    private IPackageFragment getPackageFragment(String packageName) throws JavaModelException {
-        return getPackageFragmentRoot().createPackageFragment(packageName, true, monitor);
-    }
-    
-    private IPackageFragmentRoot getPackageFragmentRoot() {
-        return getJavaProject().getPackageFragmentRoot(getProject().getFolder("src"));     
-    }
-    
-    private void createSourceFolder() throws CoreException {
-        IFolder srcDir = getProject().getFolder("src");
-        mkdirs(srcDir);    
-        addToClasspath(javaProject, JavaCore.newSourceEntry(srcDir.getFullPath()));
-    }
-
-    private void createOutputFolder() throws CoreException {
-        IFolder outputDir = getProject().getFolder("bin");
-        mkdirs(outputDir);
-        getJavaProject().setOutputLocation(outputDir.getFullPath(), monitor);
-    }
-
-    public IJavaProject getJavaProject() {
-        return javaProject;
-    }
-    
-    public void addToClasspath(IJavaProject javaProject, IClasspathEntry classpathEntry) {
-        try {
-            IClasspathEntry[] currentClasspathEntries = javaProject.getRawClasspath();
-            IClasspathEntry[] newClasspathEntries = new IClasspathEntry[currentClasspathEntries.length + 1];
-            System.arraycopy(currentClasspathEntries, 0, newClasspathEntries, 0, 
-                    currentClasspathEntries.length);
-            newClasspathEntries[currentClasspathEntries.length] = classpathEntry;
-            javaProject.setRawClasspath(newClasspathEntries, new NullProgressMonitor());
-        } catch (JavaModelException jme) {
-            jme.printStackTrace();
-        }
-    }
-
-}
diff --git a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java b/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
deleted file mode 100644
index 15902d4..0000000
--- a/tests/org.eclipse.jst.ws.jaxws.core.tests/src/org/eclipse/jst/ws/jaxws/core/tests/TestProject.java
+++ /dev/null
@@ -1,65 +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.jaxws.core.tests;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-/**
- * 
- * @author sclarke
- *
- */
-public class TestProject {
-    IProgressMonitor monitor = new NullProgressMonitor();
-
-    private IProject testProject;
-    
-    public TestProject(String projectName) throws CoreException {
-        IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-        testProject = workspaceRoot.getProject(projectName);
-        testProject.create(monitor);
-        testProject.open(monitor);
-    }
-    
-    public IProject getProject() {
-        return testProject;
-    }
-    
-    public void addProjectNature(IProject project, String nature) {
-        try {
-            IProjectDescription projectDescription = project.getDescription();
-            String[] previousNatures = projectDescription.getNatureIds();
-            String[] newNatures = new String[previousNatures.length + 1];
-            System.arraycopy(previousNatures, 0, newNatures, 0, previousNatures.length);
-            newNatures[previousNatures.length] = nature;
-            projectDescription.setNatureIds(newNatures);
-            project.setDescription(projectDescription, null);
-        } catch (CoreException ce) {
-            ce.printStackTrace();
-        }
-    }
-    
-    public void mkdirs(final IFolder folder) throws CoreException {
-        if (!folder.exists()) {
-            if (folder.getParent() instanceof IFolder) {
-                mkdirs((IFolder) folder.getParent());
-            }
-            folder.create(true, true, null);
-        }
-    }
-}