This commit was manufactured by cvs2svn to create tag 'v200901130451'.
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 ba08ab8..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +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.3.2.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
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.wst.ws,org.eclipse.core.resources,org.eclipse.jst.ws,org.eclipse.wst.common.frameworks,org.eclipse.jst.ws.cxf.core,org.eclipse.jdt.core,javax.wsdl,org.eclipse.wst.common.modulecore
-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 82e4ea3..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.org
-
-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 4c77c2c..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.getLocalizedMessage(), 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 181201f..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.JDTUtils;
-import org.eclipse.jst.ws.internal.cxf.core.utils.LaunchUtils;
-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 16347a1..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.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-
-import javax.wsdl.Definition;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-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.internal.cxf.core.utils.JDTUtils;
-import org.eclipse.jst.ws.internal.cxf.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.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.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$
-                    SOAPAddress soapAddress = WSDLUtils.getEndpointAddress(definition);
-                    if (soapAddress != null) {
-                        String address = soapAddress.getLocationURI();
-                        URL endpointURL = new URL(address);
-                        if (endpointURL.getQuery() == null) {
-                            address += "?wsdl"; //$NON-NLS-1$
-                        }
-                        model.setWsdlLocation(address);
-                    }
-        		}
-        		
-        		model.setWsdlDefinition(definition);
-        	}
-
-		} catch (MalformedURLException murle) {
-		    status = new Status(IStatus.ERROR, CXFConsumptionCorePlugin.PLUGIN_ID, 
-		            murle.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 cb6da22..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +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.3.1.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
-Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.jst.ws.consumption.ui,org.eclipse.core.resources,org.eclipse.wst.command.env.ui,org.eclipse.wst.command.env.core,org.eclipse.jdt.core,org.eclipse.jst.ws,org.eclipse.wst.common.modulecore,org.eclipse.jdt.ui,org.eclipse.wst.ws,org.eclipse.jst.ws.cxf.consumption.core,org.eclipse.wst.common.frameworks,org.eclipse.wst.command.env,org.eclipse.jst.ws.cxf.core,org.eclipse.jst.ws.cxf.ui,javax.wsdl
-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 ea18e21..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.org
-
-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 1e644bc..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);
-        CXFConsumptionUIPlugin.plugin = this;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        CXFConsumptionUIPlugin.plugin = null;
-        super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static CXFConsumptionUIPlugin getDefault() {
-        return CXFConsumptionUIPlugin.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.getLocalizedMessage(), 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 8edc8f2..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,217 +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.IAdaptable;
-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.JavaConventions;
-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.internal.cxf.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 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() {
-        if (className != null) {
-            IStructuredSelection objectSelection = new StructuredSelection(className);
-            return objectSelection;
-        }
-        return super.getObjectSelection();
-    }
-
-    public String getComponentName() {
-        return serverComponentName;
-    }
-
-    public IProject getProject() {
-            ISelectionService selectionService = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getSelectionService();
-            ISelection selection = selectionService.getSelection();
-            
-//            ISelection selection = selectionService.getSelection("org.eclipse.jdt.ui.PackageExplorer");
-//            if (selection == null) {
-//                selection = selectionService.getSelection("org.eclipse.ui.navigator.ProjectExplorer");
-//            }
-//            if (selection == null) {
-//                selection = selectionService.getSelection("org.eclipse.ui.views.ResourceNavigator");
-//            }
-            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 Status.OK_STATUS;
-    }
-
-    @Override
-    public String getObjectSelectionDisplayableString() {
-        return className;
-    }
-
-    @Override
-    public boolean validate(String stringToValidate) {
-//        IPath pathToValidate = new Path(stringToValidate);
-//        String fileExtension = pathToValidate.getFileExtension();
-//        if (fileExtension == null || !fileExtension.equals("java")) {
-//            return false;
-//        }
-        
-        className = stringToValidate;
-
-        IProject proj = getProject();
-        if (proj != null) {
-            IType type = JDTUtils.getType(proj, className);
-            if (type == null || !type.exists()) {
-                return false;
-            }
-            String sourceLevel = JavaCore.getOption(JavaCore.COMPILER_SOURCE);
-            String complianceLevel = JavaCore.getOption(JavaCore.COMPILER_COMPLIANCE);
-            return JavaConventions.validateJavaTypeName(className, sourceLevel, complianceLevel).isOK();
-        }
-        return false;
-    }
-    
-    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 ece579d..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,284 +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.core.utils.JDTUtils;
-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.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);
-
-        packageNameViewerColumn.setEditingSupport(new PackageNameEditingSupport(packageNameTableViewer,
-                new PackageNameTextCellEditor(packageNameTableViewer.getTable()), 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;
-    }
-
-    private class PackageNameTextCellEditor extends TextCellEditor implements ICellEditorListener,
-            ICellEditorValidator {
-
-        public PackageNameTextCellEditor(Composite parent) {
-            super(parent);
-            addListener(this);
-            setValidator(this);
-        }
-
-        public void applyEditorValue() {
-        }
-
-        public void cancelEditor() {
-        }
-
-        public void editorValueChanged(boolean oldValidState, boolean newValidState) {
-            statusListener.handleEvent(null);
-        }
-
-        public String isValid(Object packageName) {
-            status = JDTUtils.validatePackageName(model.getProjectName(), packageName.toString());
-            if (status.getSeverity() == IStatus.OK) {
-                return null;
-            }
-            return status.getMessage();
-        }
-    }
-
-
-}
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 9b69150..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[]{
-                        CXFCorePlugin.getEdition(), 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[] {
-                CXFCorePlugin.getEdition(), 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 9eef620..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,97 +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.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);
-
-        if (model.getCxfRuntimeVersion().compareTo(CXFCorePlugin.CXF_VERSION_2_1) >= 0) {
-            WSDL2JavaWidgetFactory.createDefaultValuesButton(wsdl2javaGroup, model);
-        }
-
-        WSDL2JavaWidgetFactory.createProcessSOAPHeadersButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createNamespacePackageMappingButton(wsdl2javaGroup, model);
-
-        WSDL2JavaWidgetFactory.createExcludesNamespaceMappingButton(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 a736892..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.consumption.ui/src/org/eclipse/jst/ws/internal/cxf/consumption/ui/widgets/object/JAXWSSelectionTransformer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.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.internal.cxf.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);
-                }
-            }
-        }
-        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 e721d0c..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.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.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 8355be1..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +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.3.2.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,org.eclipse.jst.ws.internal.cxf.core.context,org.eclipse.jst.ws.internal.cxf.core.model,org.eclipse.jst.ws.internal.cxf.core.model.impl,org.eclipse.jst.ws.internal.cxf.core.resources,org.eclipse.jst.ws.internal.cxf.core.utils
-Require-Bundle: org.eclipse.wst.common.project.facet.ui,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jem,
- org.eclipse.wst.command.env,
- org.eclipse.jst.ws,
- org.eclipse.emf.codegen,
- org.eclipse.jdt.core,
- org.eclipse.debug.core,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.core.manipulation,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- javax.jws,
- javax.xml.ws,
- org.eclipse.jdt.ui,
- org.jdom,
- javax.wsdl,
- org.eclipse.core.filesystem,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.ui.console,
- org.eclipse.emf.ecore,
- org.eclipse.wst.command.env.core,
- org.eclipse.jdt.apt.core
-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.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 a864727..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/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/bundles/org.eclipse.jst.ws.cxf.core/about.mappings b/bundles/org.eclipse.jst.ws.cxf.core/about.mappings
deleted file mode 100644
index 99af72b..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=M20081007-1400
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 492c956..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 Eclipse contributors and others 2000, 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 6f97939..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               cxf32.gif,\
-               icons/,\
-               jmerger/,\
-               .,\
-               plugin.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/cxf32.gif b/bundles/org.eclipse.jst.ws.cxf.core/cxf32.gif
deleted file mode 100644
index 811eccb..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/cxf32.gif
+++ /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/plugin.properties b/bundles/org.eclipse.jst.ws.cxf.core/plugin.properties
deleted file mode 100644
index 8b72215..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.org
-
-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 b9911de..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/plugin.xml
+++ /dev/null
@@ -1,96 +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>
-</plugin>
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 10a3505..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.java
+++ /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
- *******************************************************************************/
-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 ONEWAY_ANNOTATION_PROCESSOR_NO_RETURN_VALUE_ERROR_MESSAGE;
-
-    public static String TYPE_NAME_DIFFERENT_CASE_EXISTS;
-    public static String TYPE_WITH_NAME_ALREADY_EXISTS;
-
-    public static String WEBMETHOD_ANNOTATION_PROCESSOR_ONLY_ON_PUBLIC_METHODS_MESSAGE;
-
-    public static String WEBSERVICE_ANNOTATION_PROCESSOR_ENDPOINTINTERFACE_SEI_ERROR_MESSAGE;
-    public static String WEBSERVICE_ANNOTATION_PROCESSOR_PORTNAME_SEI_ERROR_MESSAGE;
-    public static String WEBSERVICE_ANNOTATION_PROCESSOR_SERVICENAME_SEI_ERROR_MESSAGE;
-    public static String WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_ENPOINTINTERFACE_NO_WEBMETHOS_ERROR_MESSAGE;
-    public static String WEBSERVICE_ANNOTATION_PROCESSOR_WEBSERVICE_WEBSERVICEPROVIDER_ERROR_MESSAGE;
-
-    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 993328a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCoreMessages.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
-###############################################################################
-
-#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}''
-CXF_FACET_INSTALL_DELEGATE_RUNTIME_LOCATION_NOT_SET=CXF Runtime location not set. Please set location in Preferences > Web Services > CXf 2.x Preferences
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 d63642a..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/CXFCorePlugin.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IONA Technologies PLC
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IONA Technologies PLC - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.cxf.core;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.cxf.core.context.CXFPersistentContext;
-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;
-
-/**
- * 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$
-
-    private static final String CXF_EDITION = "CXF"; //$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 CXFPersistentContext cxfContext;
-    private Java2WSPersistentContext java2WSContext;
-    private WSDL2JavaPersistentContext wsdl2JavaContext;
-
-    /**
-     * 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 static String getEdition() {
-        return CXF_EDITION;
-    }
-
-    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.getLocalizedMessage(), exception));
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/annotations/JAXWSAnnotations.java b/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/annotations/JAXWSAnnotations.java
deleted file mode 100644
index 637d802..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/annotations/JAXWSAnnotations.java
+++ /dev/null
@@ -1,143 +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.annotations;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.AST;
-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.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.StringLiteral;
-
-/**
- * 
- * @author sclarke
- */
-public final class JAXWSAnnotations {
-
-    private JAXWSAnnotations() {
-    }
-    
-    public static MemberValuePair createMemberValuePair(AST ast, String name, Expression expression) {
-        MemberValuePair memberValuePair = ast.newMemberValuePair();
-        memberValuePair.setName(ast.newSimpleName(name));
-        memberValuePair.setValue(expression);
-        return memberValuePair;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Annotation getAnnotation(AST ast,
-            Class<? extends java.lang.annotation.Annotation> annotationClass,
-            List<MemberValuePair> memberValuePairs) {
-
-        NormalAnnotation annotation = ast.newNormalAnnotation();
-        Name annotationTypeName = ast.newName(annotationClass.getSimpleName());
-        annotation.setTypeName(annotationTypeName);
-
-        for (MemberValuePair memberValuePair : memberValuePairs) {
-            List<MemberValuePair> annotationValues = annotation.values();
-            annotationValues.add(memberValuePair);
-        }
-
-        return annotation;
-    }
-
-    public static MemberValuePair getNameValuePair(CompilationUnit compilationUnit, String name) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "name", name); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getEndpointInterfaceValuePair(CompilationUnit compilationUnit,
-            String endpointInterface) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "endpointInterface", //$NON-NLS-1$
-                endpointInterface);
-    }
-
-    public static MemberValuePair getTargetNamespaceValuePair(CompilationUnit compilationUnit,
-            String targetNamespace) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "targetNamespace", targetNamespace); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getPortNameValuePair(CompilationUnit compilationUnit, String portName) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "portName", portName); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getServiceNameValuePair(CompilationUnit compilationUnit, 
-            String serviceName) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "serviceName", serviceName); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getOperationNameValuePair(CompilationUnit compilationUnit,
-            String operationName) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "operationName", operationName); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getExcludeValuePair(CompilationUnit compilationUnit, boolean exclude) {
-        return JAXWSAnnotations.getBooleanMemberValuePair(compilationUnit, "exclude", exclude); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getPartNameValuePair(CompilationUnit compilationUnit, String partName) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "partName", partName); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getClassNameValuePair(CompilationUnit compilationUnit, String className) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "className", className); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getLocalNameValuePair(CompilationUnit compilationUnit, String localName) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "localName", localName); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getFaultBeanValuePair(CompilationUnit compilationUnit, String faultBean) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "faultBean", faultBean); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getWSDLLocationValuePair(CompilationUnit compilationUnit,
-            String wsdlLocation) {
-        return JAXWSAnnotations.getStringMemberValuePair(compilationUnit, "wsdlLocation", wsdlLocation); //$NON-NLS-1$
-    }
-
-    public static MemberValuePair getStringMemberValuePair(CompilationUnit compilationUnit, String name,
-            String value) {
-        AST ast = compilationUnit.getAST();
-
-        MemberValuePair stringMemberValuePair = JAXWSAnnotations.createMemberValuePair(ast, name,
-                JAXWSAnnotations.getStringLiteral(ast, value));
-
-        return stringMemberValuePair;
-    }
-
-    public static MemberValuePair getBooleanMemberValuePair(CompilationUnit compilationUnit, String name,
-            boolean value) {
-        AST ast = compilationUnit.getAST();
-
-        MemberValuePair excludeValuePair = JAXWSAnnotations.createMemberValuePair(ast, name, JAXWSAnnotations
-                .getBooleanLiteral(ast, value));
-
-        return excludeValuePair;
-    }
-
-    private static StringLiteral getStringLiteral(AST ast, String literalValue) {
-        StringLiteral stringLiteral = ast.newStringLiteral();
-        stringLiteral.setLiteralValue(literalValue);
-        return stringLiteral;
-    }
-
-    private static BooleanLiteral getBooleanLiteral(AST ast, boolean value) {
-        BooleanLiteral booleanLiteral = ast.newBooleanLiteral(value);
-        return booleanLiteral;
-    }
-
-}
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 061d885..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/CXFPersistentContext.java
+++ /dev/null
@@ -1,99 +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.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_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_CXF_VERBOSE, Boolean.parseBoolean(CXFPackage.eINSTANCE.getCXFContext_Verbose()
-                .getDefaultValueLiteral()));
-        setDefault(PREFERENCE_CXF_USE_SPRING_APP_CONTEXT, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getCXFContext_UseSpringApplicationContext().getDefaultValueLiteral()));
-    }
-
-    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 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 24361fa..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/Java2WSPersistentContext.java
+++ /dev/null
@@ -1,256 +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;
-
-/**
- * @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, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getJava2WSContext_Soap12Binding().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_J2WS_GENERATE_XSD_IMPORTS, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getJava2WSContext_GenerateXSDImports().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_J2WS_DEFAULT_DATABINDING, DataBinding.JAXB.getLiteral());
-        setDefault(PREFERENCE_J2WS_DEFAULT_FRONTEND, Frontend.JAXWS.getLiteral());
-        setDefault(PREFERENCE_J2WS_GENERATE_CLIENT,  Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getCXFContext_GenerateClient().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_J2WS_GENERATE_SERVER, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getCXFContext_GenerateServer().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_J2WS_GENERATE_WRAPPER_FAULT_BEANS, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getJava2WSContext_GenerateWrapperFaultBeans().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_J2WS_GENERATE_WSDL, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getJava2WSContext_GenerateWSDL().getDefaultValueLiteral()));
-        
-        setDefault(PREFERENCE_J2WS_ENABLE_ANNOTATION_PROCESSING, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getJava2WSContext_AnnotationProcessingEnabled().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_GENERATE_WEB_METHOD_ANNOTATION, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getJava2WSContext_GenerateWebMethodAnnotation().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_GENERATE_WEB_PARAM_ANNOTATION, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getJava2WSContext_GenerateWebParamAnnotation().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_GENERATE_REQUEST_WRAPPER_ANNOTATION, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getJava2WSContext_GenerateRequestWrapperAnnotation().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_GENERATE_RESPONSE_WRAPPER_ANNOTATION, Boolean.parseBoolean(CXFPackage.eINSTANCE
-                .getJava2WSContext_GenerateResponseWrapperAnnotation().getDefaultValueLiteral()));
-    }
-
-    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 aa2477f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/context/WSDL2JavaPersistentContext.java
+++ /dev/null
@@ -1,280 +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;
-
-/**
- * @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 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, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getCXFContext_GenerateClient().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_GENERATE_SERVER, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getCXFContext_GenerateServer().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_GENERATE_IMPLEMENTATION, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_GenerateImplementation().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_GENERATE_ANT_BUILD_FILE, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getCXFContext_GenerateAntBuildFile().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_XJC_ARGS, ""); //$NON-NLS-1$
-        setDefault(PREFERENCE_W2J_PROCESS_SOAP_HEADERS, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_ProcessSOAPHeaders().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_NAMESPACE_PACKAGENAME_MAPPING, Boolean.parseBoolean(CXFPackage.
-            eINSTANCE.getWSDL2JavaContext_LoadDefaultNamespacePackageNameMapping().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_LOAD_DEFAULT_EXCLUDES_NAMESPACE_MAPPING, Boolean.parseBoolean(CXFPackage.
-                eINSTANCE.getWSDL2JavaContext_LoadDefaultExcludesNamepsaceMapping().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_VALIDATE_WSDL, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_Validate().getDefaultValueLiteral()));
-
-        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, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_NoAddressBinding().getDefaultValueLiteral()));
-        setDefault(PREFERENCE_W2J_USE_DEFAULT_VALUES, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_UseDefaultValues().getDefaultValueLiteral()));
-
-        setDefault(XJC_USE_DEFAULT_VALUES, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcUseDefaultValues().getDefaultValueLiteral()));
-        setDefault(XJC_TO_STRING, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToString().getDefaultValueLiteral()));
-        setDefault(XJC_TO_STRING_MULTI, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringMultiLine().getDefaultValueLiteral()));
-        setDefault(XJC_TO_STRING_SIMPLE, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcToStringSimple().getDefaultValueLiteral()));
-        setDefault(XJC_LOCATOR, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcLocator().getDefaultValueLiteral()));
-        setDefault(XJC_SYNC_METHODS, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcSyncMethods().getDefaultValueLiteral()));
-        setDefault(XJC_MARK_GENERATED, Boolean.parseBoolean(
-                CXFPackage.eINSTANCE.getWSDL2JavaContext_XjcMarkGenerated().getDefaultValueLiteral()));
-        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 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 77495e4..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFContext.java
+++ /dev/null
@@ -1,199 +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);
-}
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 42092a9..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/CXFPackage.java
+++ /dev/null
@@ -1,3240 +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.1 2008/11/10 20:37:43 david_williams 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 number of structural features of the '<em>Context</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    int CXF_CONTEXT_FEATURE_COUNT = 10;
-
-    /**
-     * 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>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>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>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>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 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 + 17;
-
-    /**
-     * 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>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>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 + 17;
-
-    /**
-     * 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 + 18;
-
-    /**
-     * 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 + 19;
-
-    /**
-     * 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 + 20;
-
-    /**
-     * 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 + 21;
-
-    /**
-     * 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 + 22;
-
-    /**
-     * 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 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 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 '{@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 '{@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 3cc9387..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/WSDL2JavaContext.java
+++ /dev/null
@@ -1,325 +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);
-}
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 9f0d97e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFDataModelImpl.java
+++ /dev/null
@@ -1,1421 +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.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 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#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 #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 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__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__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__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__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(", 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 c24151f..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/CXFPackageImpl.java
+++ /dev/null
@@ -1,1155 +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.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 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 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 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);
-
-        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);
-
-        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);
-
-        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", null, 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", null, 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", null, 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", null, 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", null, 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", null, 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", null, 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", null, 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);
-
-        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 1a4297e..0000000
--- a/bundles/org.eclipse.jst.ws.cxf.core/src/org/eclipse/jst/ws/internal/cxf/core/model/impl/WSDL2JavaDataModelImpl.java
+++ /dev/null
@@ -1,1341 +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.1 2008/11/10 20:37:42 david_williams 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#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 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 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__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__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__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__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;
-                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;
-                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(", 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 7ac9610..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.1 2008/11/10 20:37:45 david_williams 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 the 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();
-            }
-        };
-