This commit was manufactured by cvs2svn to create tag 'v200802062023'.
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.project
deleted file mode 100644
index 46d662e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.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.axis2.consumption.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f5c3d4..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Sun May 06 17:33:23 LKT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 05b7c7c..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Feb 21 10:48:27 LKT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\n<templates/>
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index e8f4da8..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.ui;singleton:=true
-Bundle-Version: 1.0.101.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin.WebServiceAxis2ConsumptionUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.wst.ws,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment,
- org.eclipse.jst.ws.axis2.consumption.core,
- org.eclipse.jst.ws.axis2.ui,
- org.eclipse.jst.ws.axis2.core
-Eclipse-LazyStart: true
-Bundle-Vendor: %PLUGIN_PROVIDER
-Export-Package: org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis2.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis2.consumption.ui.wsrt
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/about.html
deleted file mode 100644
index 9e73bda..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/build.properties
deleted file mode 100644
index 98cccde..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the 
-#											Axis2 runtime to the framework for 168762
-# 20070502   184302 sandakith@wso2.com - Lahiru Sandakith, Fix copyright for Axis2 plugins
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.properties
deleted file mode 100644
index f03ca74..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc. - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070118   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 runtime to the framework for 168762
-# 20070501   184617 sandakith@wso2.com - Lahiru Sandakith, Provide plugin details
-###############################################################################
-#
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis2 Consumption UI Plug-in
-PLUGIN_PROVIDER=WSO2
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis2
-DESC_RUNTIME_AXIS_11=Apache Axis2
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_AXIS2_EMITTER=Axis2 Emitter
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.xml
deleted file mode 100644
index fd14ae2..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="Axis2ClientConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.axis2.consumption.core.command.Axis2WebservicesServerCommand"
-             class="org.eclipse.jst.ws.internal.axis2.consumption.ui.wsrt.Axis2ClientConfigWidgetFactory"/>
-    </extension> 
-    <extension point="org.eclipse.wst.command.env.antDataMapping">
-        <map
-              key="ClientProjectName"
-              operation="org.eclipse.jst.ws.axis2.creation.core.command.Axis2ClientDefaultingCommand"
-              property="ClientProject"
-              transform="org.eclipse.jst.ws.internal.common.StringToIProjectTransformer"/>
-    </extension> 
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/plugin/WebServiceAxis2ConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/plugin/WebServiceAxis2ConsumptionUIPlugin.java
deleted file mode 100644
index 3dc912b..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/plugin/WebServiceAxis2ConsumptionUIPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the 
- * 											Axis2 runtime to the framework for 168762
- * 20070502   184302 sandakith@wso2.com - Lahiru Sandakith, Fix copyright for Axis2 plugins
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2ConsumptionUIPlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.consumption.ui";
-
-	// The shared instance
-	private static WebServiceAxis2ConsumptionUIPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2ConsumptionUIPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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 WebServiceAxis2ConsumptionUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index e544bc1..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the 
- * 											Axis2 runtime to the framework for 168762
- * 20070502   184302 sandakith@wso2.com - Lahiru Sandakith, Fix copyright for Axis2 plugins
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.task;
-
-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.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class DefaultsForHTTPBasicAuthCommand extends AbstractDataModelOperation {
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		IStatus status = Status.OK_STATUS;
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
deleted file mode 100644
index cdc50d3..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/widgets/Axis2ProxyWidget.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070513   186430 sandakith@wso2.com - Lahiru Sandakith, fix for 186430
- *										  Text not accessible on AXIS2 wizard pages.
- * 20070523   174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
- * 20070823   200413 sandakith@wso2.com - Lahiru Sandakith, Namespace to Package table fix
- * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
- * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
-import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
-import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-import org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-public class Axis2ProxyWidget extends SimpleWidgetDataContributor {
-	
-	DataModel model;
-	IStatus status = Status.OK_STATUS;
-
-
-	public Axis2ProxyWidget(DataModel model) {
-		this.model=model;
-	}
-
-	//private String pluginId_ = "org.eclipse.jst.ws.axis2.consumption.ui";
-	
-	private Button genProxyCheckbox_;
-	private Button syncAndAsyncRadioButton;
-	private Button syncOnlyRadioButton;
-	private Button asyncOnlyRadioButton;
-	//private Button testCaseCheckBoxButton;
-	//private Button generateAllCheckBoxButton;
-	private Combo databindingTypeCombo;
-	private Combo portNameCombo;
-	private Combo serviceNameCombo;
-	private Text packageText;
-	
-	//private java.util.List serviceQNameList2 = null;
-	private Table namespace2packageTable = null;
-	private Button generateAllCheckBoxButton;
-	private Button testCaseCheckBoxButton;
-	
-	private WSDLPropertyReader reader;
-	private List serviceQNameList = null;
-	Axis2EmitterContext context;
-
-
-	public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-	{
-		context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
-		UIUtils uiUtils = new UIUtils(WebServiceAxis2UIPlugin.PLUGIN_ID);
-		
-		Composite  topComp = uiUtils.createComposite(parent, 2 );
-	
-		// service name
-		serviceNameCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_SERVICE_NAME_CAPTION, null, null, SWT.READ_ONLY);
-		serviceNameCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				//loadPortNames();
-				model.setServiceName(serviceNameCombo.getText());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		// port name
-		portNameCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_PORTNAME, null, null, SWT.READ_ONLY);
-		portNameCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setPortName(portNameCombo.getText());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		// Databinding
-		databindingTypeCombo = uiUtils.createCombo(topComp, Axis2ConsumptionUIMessages.LABEL_DATABINDING_CAPTION, null, null, SWT.READ_ONLY);
-		fillDatabinderCombo();
-		databindingTypeCombo.select(0);
-		databindingTypeCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setDatabindingType(databindingTypeCombo.getText());
-			};
-			public void widgetDefaultSelected(SelectionEvent e) {
-			};
-		});
-		
-		// package name
-		packageText = uiUtils.createText(topComp, Axis2ConsumptionUIMessages.LABEL_PACKEGE_NAME, null, null,SWT.BORDER);
-		packageText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				model.setPackageText(packageText.getText());
-			}
-		});
-		
-	  	//Client type label 
-		Group clientTypeGroup = uiUtils.createGroup(parent, Axis2ConsumptionUIMessages.LABEL_CLIENT_SIDE, null, null);
-				
-		syncAndAsyncRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_SYNC_AND_ASYNC, null, null);
-		syncAndAsyncRadioButton.setSelection(
-				((context.isAsync() || context.isSync())==false)
-				?true
-				:(context.isAsync() && context.isSync()));
-		syncAndAsyncRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				//Because default setting in axis2 to be both false in thie case
-				//File a JIRA to fix this.
-				model.setSync(!syncAndAsyncRadioButton.getSelection());
-				model.setASync(!syncAndAsyncRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		syncOnlyRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_SYNC, null, null);
-		syncOnlyRadioButton.setSelection(context.isSync() && !context.isAsync());
-		syncOnlyRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setSync(syncOnlyRadioButton.getSelection());
-				model.setASync(!syncOnlyRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		asyncOnlyRadioButton = uiUtils.createRadioButton(clientTypeGroup, Axis2ConsumptionUIMessages.LABEL_ASYNC, null, null);
-		asyncOnlyRadioButton.setSelection(context.isAsync() && !context.isSync());
-		asyncOnlyRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setASync(asyncOnlyRadioButton.getSelection());
-				model.setSync(!asyncOnlyRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		
-		//Set the sync async to default 
-		model.setSync(context.isSync());
-		model.setASync(context.isAsync());
-		
-	   	// generate test case option
-		
-		Composite checkBoxes = uiUtils.createComposite(parent, 1);
-		testCaseCheckBoxButton = uiUtils.createCheckbox(checkBoxes, Axis2ConsumptionUIMessages.LABEL_GENERATE_TESTCASE_CAPTION, null, null);
-		testCaseCheckBoxButton.setSelection(context.isClientTestCase());
-		model.setTestCaseCheck(context.isClientTestCase());
-		testCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setTestCaseCheck(testCaseCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-
-		// generate all
-		generateAllCheckBoxButton = uiUtils.createCheckbox(checkBoxes, Axis2ConsumptionUIMessages.LABEL_GENERATE_ALL, null, null);
-		generateAllCheckBoxButton.setSelection(context.isClientGenerateAll());
-		generateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setGenerateAllCheck(generateAllCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-	   
-	    new Label(parent,SWT.HORIZONTAL);
-        namespace2packageTable = new Table(parent,SWT.BORDER|SWT.MULTI);
-        namespace2packageTable.setLinesVisible(true);
-        namespace2packageTable.setHeaderVisible(true); 
-        namespace2packageTable.setEnabled(true);
-              
-        declareColumn(namespace2packageTable,
-        		350, //a default width until we adjust
-        		Axis2ConsumptionUIMessages.LABEL_NAMESPACE);
-        declareColumn(namespace2packageTable,
-        		200,//a default width until we adjust
-        		Axis2ConsumptionUIMessages.LABEL_PACKAGE);
-        
-        namespace2packageTable.setVisible(true);
-        
-        // add the table editor
-        final TableEditor editor = new TableEditor(namespace2packageTable);
-        editor.setColumn(1);
-        editor.horizontalAlignment = SWT.LEFT;
-        editor.grabHorizontal = true;
-
-        namespace2packageTable.addListener(SWT.MouseDown, new Listener() {
-            public void handleEvent(Event event) {
-              Rectangle clientArea = namespace2packageTable.getClientArea();
-              Point pt = new Point(event.x, event.y);
-              int index = namespace2packageTable.getTopIndex();
-              while (index < namespace2packageTable.getItemCount()) {
-                boolean visible = false;
-                final TableItem item = namespace2packageTable.getItem(index);
-                for (int i = 0; i < namespace2packageTable.getColumnCount(); i++) {
-                  Rectangle rect = item.getBounds(i);
-                  if (rect.contains(pt)) {
-                    final int column = i;
-                    final Text text = new Text(namespace2packageTable, SWT.NONE);
-                    Listener textListener = new Listener() {
-                      public void handleEvent(final Event e) {
-                        switch (e.type) {
-                        case SWT.FocusOut:
-                          item.setText(column, text.getText());
-                          text.dispose();
-                          break;
-                        case SWT.Traverse:
-                          switch (e.detail) {
-                          case SWT.TRAVERSE_RETURN:
-                            item
-                                .setText(column, text
-                                    .getText());
-                          // FALL THROUGH
-                          case SWT.TRAVERSE_ESCAPE:
-                            text.dispose();
-                            e.doit = false;
-                          }
-                          break;
-                        }
-                      }
-                    };
-                    text.addListener(SWT.FocusOut, textListener);
-                    text.addListener(SWT.Traverse, textListener);
-                    editor.setEditor(text, item, i);
-                    text.setText(item.getText(i));
-                    text.selectAll();
-                    text.setFocus();
-                    return;
-                  }
-                  if (!visible && rect.intersects(clientArea)) {
-                    visible = true;
-                  }
-                }
-                if (!visible)
-                  return;
-                index++;
-              }
-              model.setNamespaseToPackageMapping(getNs2PkgMapping());
-            }
-          });
-        
-        namespace2packageTable.addListener(SWT.MouseExit, new Listener() {
-            public void handleEvent(Event event) {
-            	 model.setNamespaseToPackageMapping(getNs2PkgMapping());
-            }
-        });
-        
-
-//		UIUtils      uiUtils  = new UIUtils( pluginId_ );
-//		parent.setToolTipText( Axis2ConsumptionUIMessages.TOOLTIP_PPAE_PAGE );
-//		PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." +  this.pluginId_);
-		
-		populateParamsFromWSDL();
-		populateModel();
-
-		return this;
-	}
-	
-	/**
-	 * A util method to create a new column
-	 * @param table
-	 * @param width
-	 * @param colName
-	 */
-	private void declareColumn(Table table, int width,String colName){
-        TableColumn column = new TableColumn(table,SWT.NONE);
-        column.setWidth(width);
-        column.setText(colName);
-    }
-	
-	/**
-	 * get the package to namespace mappings
-	 * @return
-	 */
-	public String getNs2PkgMapping(){
-		String returnList="";
-		TableItem[] items = namespace2packageTable.getItems();
-		String packageValue; 
-		for (int i=0;i<items.length;i++){
-			packageValue = items[i].getText(1);
-			if (packageValue!=null && !"".equals(packageValue)){
-				returnList = returnList +
-				             ("".equals(returnList)?"":",") +
-				             items[i].getText(0)+ "=" + packageValue;
-			}
-			
-		}
-		return "".equals(returnList)?null:returnList;
-	}
-
-	public boolean isGenProxy()	{
-		//boolean enabled = genProxyCheckbox_.getSelection();
-		return true; //always
-
-	}
-
-	public void setGenerateProxy( Boolean genProxy ){
-		genProxyCheckbox_.setSelection( genProxy.booleanValue() );
-	}   
-	
-	/**
-	 * Fill the combo with proper databinding names
-	 */
-	private void fillDatabinderCombo() {
-		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
-		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
-		databindingTypeCombo.select(0);
-	}
-	
-	private void populateModel() {
-		model.setServiceName(serviceNameCombo.getText());
-		model.setPortName(portNameCombo.getText());
-		model.setPackageText(packageText.getText());
-		model.setDatabindingType(databindingTypeCombo.getText());
-		//model.setASync(asyncOnlyRadioButton.getSelection());
-		//model.setSync(syncOnlyRadioButton.getSelection());
-		if (syncAndAsyncRadioButton.getSelection()){
-			model.setASync(!syncAndAsyncRadioButton.getSelection());
-			model.setSync(!syncAndAsyncRadioButton.getSelection());
-		}
-		model.setGenerateAllCheck(generateAllCheckBoxButton.getSelection());
-		model.setTestCaseCheck(testCaseCheckBoxButton.getSelection());
-		model.setNamespaseToPackageMapping(getNs2PkgMapping());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-	 */
-	public IStatus getStatus() 
-	{
-		IStatus result = null;
-		return result;
-	}
-
-	private void populatePackageName() {
-		this.packageText.setText(reader.packageFromTargetNamespace());
-	}
-
-	/**
-	 * populate the service and the port from the WSDL this needs to be public
-	 * since the WSDLselection page may call this
-	 */
-	public void populateParamsFromWSDL() {
-		if (reader == null)
-			reader = new WSDLPropertyReader();
-		try {
-			String lname = model.getWsdlURI();
-			if (!"".equals(lname.trim())) {
-
-				reader.readWSDL(model.getWebProjectName(), lname);
-
-				this.serviceQNameList = reader.getServiceList();
-				if (!serviceQNameList.isEmpty()) {
-					serviceNameCombo.removeAll();
-					for (int i = 0; i < serviceQNameList.size(); i++) {
-						// add the local part of the
-						Object serviceQnameInstance = serviceQNameList.get(0);
-						Class QNameClass = ClassLoadingUtil
-								.loadClassFromAntClassLoader("javax.xml.namespace.QName");
-						Method GetLocalPartMethod  = QNameClass.getMethod("getLocalPart", null);
-						Object resultLocalPart = GetLocalPartMethod
-										.invoke(serviceQnameInstance, null);
-						serviceNameCombo.add(resultLocalPart.toString());
-					}
-					;
-					// select the first one as the default
-					serviceNameCombo.select(0);
-
-					// load the ports
-					loadPortNames();
-
-				} else {
-					// service name list being empty means we are switching to
-					// the interface mode
-					if (serviceNameCombo!=null) serviceNameCombo.removeAll();
-					if (portNameCombo!=null) portNameCombo.removeAll();
-
-				}
-
-				populatePackageName();
-
-				//populate the namespacess
-				loadNamespaces(reader.getDefinitionNamespaceMap());
-			}
-		} catch (Exception e) {
-			status = StatusUtils.errorStatus(NLS.bind(
-					Axis2ConsumptionUIMessages.ERROR_INVALID_WSDL_FILE_READ_WRITEL,
-					new String[]{e.getLocalizedMessage()}), e);
-		}
-	}
-	
-	/**
-	 * Loads the namespaces
-	 * @param namespaceMap
-	 */
-	private void loadNamespaces(Map namespaceMap){
-		Iterator namespaces = namespaceMap.values().iterator();
-		namespace2packageTable.removeAll();
-        TableItem[] items = new TableItem[namespaceMap.size()]; // An item for each field
-        
-        int i = 0;
-        while(namespaces.hasNext()){
-        	
-           items[i] = new TableItem(namespace2packageTable, SWT.NULL);
-           String namespace = (String)namespaces.next();
-           items[i].setText(0,namespace);
-           items[i].setText(1,getPackageFromNamespace(namespace));
-           i++;
-        }
-
-        namespace2packageTable.setVisible(true);
-		
-	}
-
-	private void loadPortNames() {
-		int selectionIndex = serviceNameCombo.getSelectionIndex();
-		if (selectionIndex != -1) {
-			java.util.List ports = reader.getPortNameList( serviceQNameList
-					.get(selectionIndex));
-			if (!ports.isEmpty()) {
-				portNameCombo.removeAll();
-				for (int i = 0; i < ports.size(); i++) {
-					// add the local part of the
-					portNameCombo.add(ports.get(i).toString());
-				}
-				portNameCombo.select(0);
-			} else {
-				// error no ports found
-			}
-		}
-	}
-	
-	/**
-	 * get the package derived by  Namespace
-	 */
-	public String getPackageFromNamespace(String namespace){
-		// Use reflection to invoke org.apache.axis2.util.URLProcessor 
-		// makePackageName(namespace) statically
-		Object stringReturn = null;
-		try {
-			Class URLProcessorClass = ClassLoadingUtil
-					.loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
-			Method makePackageNameMethod = URLProcessorClass
-					.getMethod("makePackageName", new Class[]{String.class});
-			stringReturn = makePackageNameMethod.invoke(null, new Object[]{namespace});
-		} catch (SecurityException e) {
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return  (String)stringReturn;
-
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wizard/client/WebServiceClientAxis2Type.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wizard/client/WebServiceClientAxis2Type.java
deleted file mode 100644
index f0cff69..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wizard/client/WebServiceClientAxis2Type.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets.Axis2ProxyWidget;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-
-public class WebServiceClientAxis2Type implements CommandWidgetBinding {
-	
-	DataModel model;
-	
-	public WebServiceClientAxis2Type(DataModel model){
-		this.model = model;
-	}
-
-	
-	  /* (non-Javadoc)
-	   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings
-	   * (org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry)
-	   */
-	  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-	  	// AxisClientDefaultingCommand  	
-	    // dataRegistry.addMapping( Axis2ClientDefaultingCommand.class, 
-		// "CustomizeClientMappings", Axis2ProxyWidget.class );
-	    
-	  }
-	  
-	  /* (non-Javadoc)
-	   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings
-	   * (org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-	   */
-	  public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-	   
-	    widgetRegistry.add( "AxisClientStart", 
-	        Axis2ConsumptionUIMessages.PAGE_TITLE_WS_AXIS2_PROXY,
-	        Axis2ConsumptionUIMessages.PAGE_DESC_WS_AXIS2_PROXY,
-	        new WidgetContributorFactory()
-	        {
-	          public WidgetContributor create()
-	          {
-	            return new Axis2ProxyWidget(model);
-	          }
-	        } );
-	    
-	    //widgetRegistry.add( "AxisClientBeanMapping", 
-	    //    Axis2ConsumptionUIMessages.PAGE_TITLE_WS_XML2PROXY,
-	    //    Axis2ConsumptionUIMessages.LABEL_EXPLORE_MAPPINGS_XML2BEAN,
-	    //    new WidgetContributorFactory()
-	    //    {
-	    //      public WidgetContributor create()
-	    //      {
-	    //        return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
-	    //      }
-	    //    } );
-	  }
-	  
-	  /* (non-Javadoc)
-	   * @see org.eclipse.wst.command.internal.env.core.fragment
-	   * .CommandFragmentFactoryFactory#create()
-	   */
-	  public CommandFragmentFactory create() 
-	  {
-	    return new CommandFragmentFactory()
-	           {
-	             public CommandFragment create()
-	             {
-	               //dead code - doesn't matter what gets returned here.
-	               return new SimpleFragment();
-	             }
-	           };
-	  }
-	  /* (non-Javadoc)
-	   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish
-	   * (org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-	   */
-	  public void registerCanFinish(CanFinishRegistry canFinishRegistry){
-	  }
-	  
-	  public void setWebServiceDataModel( DataModel model ){
-			this.model = model;
-	  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2ClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2ClientConfigWidgetFactory.java
deleted file mode 100644
index 0d1471d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2ClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070230   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070601   190505 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.axis2.consumption.core.command.Axis2ClientDefaultingCommand;
-import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.widgets.Axis2ProxyWidget;
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.wizard.client.WebServiceClientAxis2Type;
-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.WidgetBindingToWidgetFactoryAdapter;
-
-public class Axis2ClientConfigWidgetFactory implements INamedWidgetContributorFactory{
-	private INamedWidgetContributor             proxyConfigWidget;
-	private INamedWidgetContributor             mappingsWidget;
-	private Axis2ProxyWidget                     proxyWidget;
-	private WidgetBindingToWidgetFactoryAdapter adapter;
-	private DataModel 							model;
-	private WebServiceClientAxis2Type           wsClientAxis2Type;
-	private DataMappingRegistry dataRegistry;
-	
-	public Axis2ClientConfigWidgetFactory(){
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() {
-		init();
-		//wsClientAxis2Type.setWebServiceDataModel(model);
-		return proxyConfigWidget;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) {
-	  return widgetContributor == proxyConfigWidget && proxyWidget.isGenProxy() 
-	  								? mappingsWidget 
-	  								: null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) {
-		this.dataRegistry=dataRegistry;
-		// Map the data model from the defaulting command to this widget factory.
-		// The framework will actually to the call to getWebServiceDataModel in
-		// the ExampleDefaultingCommand class and then call the setWebServiceDataModel
-		// method in this class.
-		dataRegistry.addMapping( Axis2ClientDefaultingCommand.class, 
-								 "WebServiceDataModel",  //$NON-NLS-1$
-								 Axis2ClientConfigWidgetFactory.class );
-	}
-	
-	public void setWebServiceDataModel( DataModel model ){
-		this.model = model;
-	}
-	
-	private void init(){
-		  wsClientAxis2Type = new WebServiceClientAxis2Type(model);
-		  adapter = new WidgetBindingToWidgetFactoryAdapter(wsClientAxis2Type );
-		  proxyConfigWidget = adapter.getWidget( "AxisClientStart" ); //$NON-NLS-1$
-		  proxyWidget       = (Axis2ProxyWidget)proxyConfigWidget
-		  				.getWidgetContributorFactory().create();
-		  mappingsWidget   = adapter.getWidget( "AxisClientBeanMapping" ); //$NON-NLS-1$
-		  adapter.registerDataMappings( dataRegistry );
-
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2WebServiceClient.java b/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2WebServiceClient.java
deleted file mode 100644
index 22ae8a0..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/wsrt/Axis2WebServiceClient.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070230   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070518   187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.consumption.core.command.Axis2ClientCodegenCommand;
-import org.eclipse.jst.ws.axis2.consumption.core.command.Axis2ClientDefaultingCommand;
-import org.eclipse.jst.ws.axis2.consumption.core.command.Axis2ClientTestCaseIntegrateCommand;
-import org.eclipse.jst.ws.axis2.consumption.core.command.Axis2WebservicesServerCommand;
-import org.eclipse.jst.ws.axis2.consumption.core.data.DataModel;
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.wst.command.internal.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.ws.internal.wsrt.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;
-
-public class Axis2WebServiceClient extends AbstractWebServiceClient {
-
-	public Axis2WebServiceClient(WebServiceClientInfo info) {
-		super(info);
-	}
-
-	public ICommandFactory assemble(IEnvironment env, IContext ctx,
-			ISelection arg2, String arg3, String arg4) {
-		return null;
-	}
-
-	public ICommandFactory deploy(IEnvironment env, IContext ctx,
-			ISelection arg2, String arg3, String arg4) {
-		return null;
-	}
-
-	public ICommandFactory develop(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject) {
-		DataModel model = new DataModel();
-		
-		EclipseEnvironment environment = (EclipseEnvironment)env;
-		registerDataMappings( environment.getCommandManager().getMappingRegistry());
-		model.setWebProjectName(project);
-		Vector commands = new Vector();
-		commands.add(new Axis2ClientDefaultingCommand(model,this));
-		commands.add(new Axis2WebservicesServerCommand(model, project));
-		commands.add(new Axis2ClientCodegenCommand(model));
-		commands.add(new Axis2ClientTestCaseIntegrateCommand(
-				ResourcesPlugin.getWorkspace().getRoot().getProject(project),model));
-		
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject) {
-		return null;
-	}
-
-	public ICommandFactory run(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject) {
-		return null;
-	}
-
-	public void registerDataMappings(DataMappingRegistry registry){
-		// AxisClientDefaultingCommand
-		registry.addMapping(Axis2ClientDefaultingCommand.class, 
-							"WsdlURL", 
-							DefaultsForHTTPBasicAuthCommand.class,
-							"WsdlServiceURL", null); //OK
-
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.project
deleted file mode 100644
index b48462a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.creation.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.creation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e81617d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Sun May 06 17:33:53 LKT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0477943..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis2.creation.ui;singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Activator: org.eclipse.jst.ws.internal.axis2.creation.ui.plugin.WebServiceAxis2CreationUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.command.env.core,
- org.eclipse.emf.common,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.command.env.ui,
- org.eclipse.jst.ws,
- org.eclipse.wst.command.env,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.axis2.creation.core,
- org.eclipse.jst.ws.axis2.consumption.ui,
- org.eclipse.jst.ws.axis2.consumption.core,
- org.eclipse.jst.ws.axis2.core,
- org.eclipse.jst.ws.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis2.creation.ui/about.html
deleted file mode 100644
index 9e73bda..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis2.creation.ui/build.properties
deleted file mode 100644
index 6313a1d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the
-#										 Axis2 runtime to the framework for 168762
-# 20070502   184302 sandakith@wso2.com - Lahiru Sandakith, Fix copyright for Axis2 plugins
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.properties
deleted file mode 100644
index 2118334..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc. - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070501   184617 sandakith@wso2.com - Lahiru Sandakith, Provide plugin details
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis2 Creation UI Plug-in
-PLUGIN_PROVIDER=WSO2
-
-LABEL_RUNTIME_AXIS_2=Apache Axis2
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.xml
deleted file mode 100644
index 5004d58..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/plugin.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-      <widgetFactory   
-        id="BeanExampleConfig"
-        insertBeforeCommandId="org.eclipse.jst.ws.axis2.creation.core.command.Axis2BUCommand"
-        class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2BeanConfigWidgetFactory"/>
-    </extension> 
-    
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-      <widgetFactory   
-        id="SkelExampleConfig"
-        insertBeforeCommandId="org.eclipse.jst.ws.axis2.creation.core.command.Axis2TDCommand"
-        class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2SkelConfigWidgetFactory" />
-    </extension> 
-    
-    <extension point="org.eclipse.jst.ws.consumption.ui.runtimes">
-      <runtime
-        id="org.eclipse.jst.ws.axis2.creation.axis2WebServiceRT"
-        label="%LABEL_RUNTIME_AXIS_2"
-        serverRequired="false"/>
-    </extension>
-
-
-	<!-- define support for Axis2 Java bean bottom up and top-down support in web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.serviceRuntimes">
-      <serviceRuntime
-        id="org.eclipse.jst.ws.axis2.creation.java" 
-        serviceImplementationTypeId="org.eclipse.jst.ws.wsImpl.java"
-        runtimeId="org.eclipse.jst.ws.axis2.creation.axis2WebServiceRT"
-        bottomUp="true"
-        topDown="true"
-        class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2WebServiceRuntime">
-
-        <required-facet-version facet="jst.web" version="2.3" allow-newer="true"/>
-        <required-facet-version facet="axis2.core" version="1.1" allow-newer="true" />
-        <required-facet-version facet="axis2.ext" version="1.1" allow-newer="true" />
-
-      </serviceRuntime>
-    </extension>   
-        
-    <!-- define support for Axis Java clients in Web projects -->
-    <extension point="org.eclipse.jst.ws.consumption.ui.clientRuntimes">
-      <clientRuntime
-        id="org.eclipse.jst.ws.axis2.consumption.web"
-        clientImplementationTypeId="org.eclipse.jst.ws.client.type.java"
-        runtimeId="org.eclipse.jst.ws.axis2.creation.axis2WebServiceRT"
-        class="org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt.Axis2WebServiceRuntime">
-
-        <required-facet-version facet="jst.web" version="2.3" allow-newer="true" />
-        <required-facet-version facet="axis2.core" version="1.1" allow-newer="true" />
-        <required-facet-version facet="axis2.ext" version="1.1" allow-newer="true" />
-
-      </clientRuntime>
-    </extension>     
-    
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/plugin/WebServiceAxis2CreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/plugin/WebServiceAxis2CreationUIPlugin.java
deleted file mode 100644
index 1ebe6f5..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/plugin/WebServiceAxis2CreationUIPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.creation.ui.plugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2CreationUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.creation.ui";
-
-	// The shared instance
-	private static WebServiceAxis2CreationUIPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2CreationUIPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-
-	/**
-	 * @return the shared instance
-	 */
-	public static WebServiceAxis2CreationUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java
deleted file mode 100644
index 4fd723e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/bean/ServicesXMLSelectBeanWidget.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070513   186430 sandakith@wso2.com - Lahiru Sandakith, fix for 186430
- *										  Text not accessible on AXIS2 wizard pages.
- * 20070529   188742 sandakith@wso2.com - Lahiru Sandakith, fix for 188742
- * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
- * 20071030	  207621 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.bean;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.plugin.WebServiceAxis2ConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-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;
-
-
-public class ServicesXMLSelectBeanWidget extends SimpleWidgetDataContributor 
-{
-	private DataModel 	model;
-	private Button	 	browseButton;
-	private Text 		servicesXMLPath;
-	private Button 		generateServicesXML;
-	private Button 		haveServicesXML;
-
-	public ServicesXMLSelectBeanWidget( DataModel model )
-	{
-		this.model = model;  
-	}
-
-	public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
-	{
-		UIUtils uiUtils = new UIUtils(WebServiceAxis2ConsumptionUIPlugin.PLUGIN_ID);
-		
-		Text label = new Text(parent, SWT.READ_ONLY);
-		label.setText( Axis2CreationUIMessages.LABEL_AXIS2_PREFERENCE_PAGE );
-		
-		model.setGenerateServicesXML(true);
-		model.setServicesXML(false);
-
-		final Composite radioComp = uiUtils.createComposite(parent, 1);
-		
-		haveServicesXML = uiUtils.createRadioButton(radioComp, Axis2CreationUIMessages.LABEL_HAVE_SERVICES_XML_FILE, null, null );
-		haveServicesXML.addSelectionListener( new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				if (haveServicesXML.getSelection()){
-					haveServicesXML.setSelection(true);
-					generateServicesXML.setSelection(false);
-					enableServicesXMLBrowse();
-				}else{
-					if (!generateServicesXML.getSelection()){
-						haveServicesXML.setSelection(true); 
-						generateServicesXML.setSelection(false);
-						enableServicesXMLBrowse();
-					}else{
-						haveServicesXML.setSelection(false);
-						disableServicesXMLBrowse();
-					}
-				}
-				model.setGenerateServicesXML(false);
-				model.setServicesXML(true);
-
-				// Need to trigger a validation at this point to ensure
-				// that the next button is enabled properly just in case
-				// this is the last page in the wizard.
-				statusListener.handleEvent( null );
-			}     
-		});
-		
-		final Composite pathComp = uiUtils.createComposite(radioComp, 3);
-		servicesXMLPath = uiUtils.createText(pathComp, "", null, null, SWT.BORDER );
-		servicesXMLPath.addModifyListener( new ModifyListener()
-		{
-			public void modifyText(ModifyEvent e)
-			{
-				model.setPathToServicesXML( servicesXMLPath.getText() );
-				// Need to trigger a validation at this point to ensure
-				// that the next button is enabled properly just in case
-				// this is the last page in the wizard.
-				statusListener.handleEvent( null );
-			}
-		});
-
-		
-		browseButton = uiUtils.createPushButton(pathComp, Axis2CreationUIMessages.LABEL_BROWSE, null, null );
-		browseButton.addSelectionListener( new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleBrowse(pathComp.getShell());
-				// Need to trigger a validation at this point to ensure
-				// that the next button is enabled properly just in case
-				// this is the last page in the wizard.
-				statusListener.handleEvent( null );
-			}     
-		}); 
-
-
-		generateServicesXML = uiUtils.createRadioButton(radioComp, Axis2CreationUIMessages.LABEL_DEFAULT_SERVICES_XML_FILE, null, null);
-		generateServicesXML.setSelection(true);
-		generateServicesXML.addSelectionListener( new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				if (generateServicesXML.getSelection()){
-					generateServicesXML.setSelection(true); 
-					haveServicesXML.setSelection(false);
-					disableServicesXMLBrowse();
-				}else{
-					if (!haveServicesXML.getSelection()){
-						generateServicesXML.setSelection(true); 
-						haveServicesXML.setSelection(false);
-					}else{
-						generateServicesXML.setSelection(false);
-					}
-				}
-				model.setGenerateServicesXML(true);
-				model.setServicesXML(false);
-				// Need to trigger a validation at this point to ensure
-				// that the next button is enabled properly just in case
-				// this is the last page in the wizard.
-				statusListener.handleEvent( null );
-			}     
-		}); 
-
-		disableServicesXMLBrowse();
-
-		return this;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-	 */
-	public IStatus getStatus() 
-	{
-		IStatus result = null;
-
-		if( haveServicesXML.getSelection() && servicesXMLPath.getText().equals("") )
-		{
-			result = new Status( IStatus.ERROR, 
-								"id", 
-								0, 
-								Axis2CreationUIMessages.ERROR_INVALID_SERVICES_XML, 
-								null ); 
-		}
-
-		return result;
-	}
-
-	/**
-	 * enable the services.xml text and browse button
-	 */
-	private void enableServicesXMLBrowse(){
-		browseButton.setEnabled(true);
-		servicesXMLPath.setEnabled(true);
-	}
-
-	/**
-	 * disable the services.xml text and browse button
-	 */
-	private void disableServicesXMLBrowse(){
-		browseButton.setEnabled(false);
-		servicesXMLPath.setEnabled(false);
-	}
-
-	/**
-	 * Pops up the file browse dialog box
-	 */
-	private void handleBrowse(Shell parent) {
-		FileDialog fileDialog = new FileDialog(parent);
-		fileDialog.setFilterExtensions(new String[] { Axis2Constants.FILE_XML });
-		String fileName = fileDialog.open();
-		if (fileName != null) {
-			servicesXMLPath.setText(fileName);
-			model.setPathToServicesXML( servicesXMLPath.getText() );
-		}
-	}
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java
deleted file mode 100644
index 6e0bd75..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/widgets/skeleton/WSDL2JAVASkelConfigWidget.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070425   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070518   187311 sandakith@wso2.com - Lahiru Sandakith, Fixing test resource addition
- * 20070523   174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
- * 20070823   200413 sandakith@wso2.com - Lahiru Sandakith, Namespace to Package table fix
- * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
-import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
-import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-
-
-public class WSDL2JAVASkelConfigWidget extends SimpleWidgetDataContributor 
-{
-	private DataModel model;
-	IStatus status = Status.OK_STATUS;
-
-	//controls
-	//check box for server side interface
-	private Button generateServerSideInterfaceCheckBoxButton;
-	private Button generateAllCheckBoxButton;
-	private Combo databindingTypeCombo;
-	// Text box to have the portname
-	private Combo portNameCombo;
-	//Text box to have the service name
-	private Combo serviceNameCombo;
-	private WSDLPropertyReader reader;
-	private java.util.List serviceQNameList = null;
-	private Table namespace2packageTable = null;
-	//Label holding the full qualified package name for generated code
-	private Text packageText;
-	//Checkbox to enable the generation of test case classes 
-	// for the generated implementation of the webservice.
-	Label      label, fillLabel, fillLabel1, fillLabel2, fillLabel3, fillLabel4, fillLabel5, fillLabel6;
-	Axis2EmitterContext context;
-
-	public WSDL2JAVASkelConfigWidget( DataModel model )	{
-		context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
-		this.model = model;  
-	}
-
-	public WidgetDataEvents addControls( Composite parent, final Listener statusListener ){
-		Composite  mainComp = new Composite( parent, SWT.NONE );
-		GridLayout layout   = new GridLayout();
-		mainComp.setLayout(layout);
-
-		layout.numColumns = 3;
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		mainComp.setLayoutData( gd );
-
-		// service name
-		label = new Label(mainComp, SWT.NULL);
-		label.setText(Axis2CreationUIMessages.LABEL_SERVICE_NAME_CAPTION);
-
-		serviceNameCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER
-				| SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		serviceNameCombo.setLayoutData(gd);
-		serviceNameCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setServiceName(serviceNameCombo.getText());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		// port name
-		label = new Label(mainComp, SWT.NULL);
-		label.setText(Axis2CreationUIMessages.LABEL_PORTNAME);
-		portNameCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER
-				| SWT.READ_ONLY);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		portNameCombo.setLayoutData(gd);
-		portNameCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setPortName(portNameCombo.getText());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		// Databinding
-		label = new Label(mainComp, SWT.NULL);
-		label.setText(Axis2CreationUIMessages.LABEL_DATABINDING_CAPTION);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		databindingTypeCombo = new Combo(mainComp, SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY);
-		databindingTypeCombo.setLayoutData(gd);
-		fillDatabinderCombo();
-		databindingTypeCombo.select(0);
-		databindingTypeCombo.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setDatabindingType(databindingTypeCombo.getText());
-			};
-			public void widgetDefaultSelected(SelectionEvent e) {
-			};
-		});
-
-		// package name
-		label = new Label(mainComp, SWT.NULL);
-		label.setText(Axis2CreationUIMessages.LABEL_PACKEGE_NAME);
-		packageText = new Text(mainComp, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-
-		packageText.setLayoutData(gd);
-		packageText.setText(""); // get this text from the
-		packageText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				model.setPackageText(packageText.getText());
-			}
-		});
-
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel2 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel3 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel4 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
-		model.setServerXMLCheck(true);
-
-		//the server side interface option
-		generateServerSideInterfaceCheckBoxButton = new Button(mainComp, SWT.CHECK);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		generateServerSideInterfaceCheckBoxButton.setLayoutData(gd);
-		generateServerSideInterfaceCheckBoxButton
-							.setSelection(context.isServiceInterfaceSkeleton());
-		generateServerSideInterfaceCheckBoxButton.setText(Axis2CreationUIMessages.
-														  LABEL_GENERATE_SERVERSIDE_INTERFACE);
-		model.setGenerateAllCheck(context.isServiceInterfaceSkeleton());
-		generateServerSideInterfaceCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setGenerateServerSideInterface(
-						generateServerSideInterfaceCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		// generate all
-		generateAllCheckBoxButton = new Button(mainComp, SWT.CHECK);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		generateAllCheckBoxButton.setLayoutData(gd);
-		generateAllCheckBoxButton.setSelection(context.isServiceGenerateAll());
-		generateAllCheckBoxButton.setText(Axis2CreationUIMessages.LABEL_GENERATE_ALL);
-		generateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setGenerateAllCheck(generateAllCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel5 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-
-		//filling label 
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		fillLabel6 = new Label(mainComp, SWT.HORIZONTAL | SWT.NULL);
-		
-		//add a table to set namespace to package mapping
-		gd = new GridData(GridData.FILL_BOTH);
-        gd.horizontalSpan = 3;
-        gd.verticalSpan = 5;
-        
-        namespace2packageTable = new Table(mainComp,SWT.BORDER|SWT.MULTI);
-        namespace2packageTable.setLinesVisible(true);
-        namespace2packageTable.setHeaderVisible(true); 
-        namespace2packageTable.setEnabled(true);
-        namespace2packageTable.setLayoutData(gd);
-       
-        declareColumn(namespace2packageTable,
-        		350, //a default width until we adjust
-        		Axis2CreationUIMessages.LABEL_NAMESPACE);
-        declareColumn(namespace2packageTable,
-        		200,//a default width until we adjust
-        		Axis2CreationUIMessages.LABEL_PACKAGE);
-        
-        namespace2packageTable.setVisible(true);
-        
-        // add the table editor
-        final TableEditor editor = new TableEditor(namespace2packageTable);
-        editor.setColumn(1);
-        editor.horizontalAlignment = SWT.LEFT;
-        editor.grabHorizontal = true;
-
-        namespace2packageTable.addListener(SWT.MouseDown, new Listener() {
-            public void handleEvent(Event event) {
-              Rectangle clientArea = namespace2packageTable.getClientArea();
-              Point pt = new Point(event.x, event.y);
-              int index = namespace2packageTable.getTopIndex();
-              while (index < namespace2packageTable.getItemCount()) {
-                boolean visible = false;
-                final TableItem item = namespace2packageTable.getItem(index);
-                for (int i = 0; i < namespace2packageTable.getColumnCount(); i++) {
-                  Rectangle rect = item.getBounds(i);
-                  if (rect.contains(pt)) {
-                    final int column = i;
-                    final Text text = new Text(namespace2packageTable, SWT.NONE);
-                    Listener textListener = new Listener() {
-                      public void handleEvent(final Event e) {
-                        switch (e.type) {
-                        case SWT.FocusOut:
-                          item.setText(column, text.getText());
-                          text.dispose();
-                          break;
-                        case SWT.Traverse:
-                          switch (e.detail) {
-                          case SWT.TRAVERSE_RETURN:
-                            item
-                                .setText(column, text
-                                    .getText());
-                          case SWT.TRAVERSE_ESCAPE:
-                            text.dispose();
-                            e.doit = false;
-                          }
-                          break;
-                        }
-                      }
-                    };
-                    text.addListener(SWT.FocusOut, textListener);
-                    text.addListener(SWT.Traverse, textListener);
-                    editor.setEditor(text, item, i);
-                    text.setText(item.getText(i));
-                    text.selectAll();
-                    text.setFocus();
-                    return;
-                  }
-                  if (!visible && rect.intersects(clientArea)) {
-                    visible = true;
-                  }
-                }
-                if (!visible)
-                  return;
-                index++;
-              }
-              model.setNamespaseToPackageMapping(getNs2PkgMapping());
-            }
-          });
-        
-        namespace2packageTable.addListener(SWT.MouseExit, new Listener() {
-            public void handleEvent(Event event) {
-            	 model.setNamespaseToPackageMapping(getNs2PkgMapping());
-            }
-        });
-        
-		populateParamsFromWSDL();
-		populateModel();
-
-		return this;
-	}
-
-	private void populateModel() {
-		model.setServiceName(serviceNameCombo.getText());
-		model.setPortName(portNameCombo.getText());
-		model.setPackageText(packageText.getText());
-		model.setDatabindingType(databindingTypeCombo.getText());
-		model.setGenerateAllCheck(generateAllCheckBoxButton.getSelection());
-		model.setGenerateServerSideInterface(
-				generateServerSideInterfaceCheckBoxButton.getSelection());
-		model.setNamespaseToPackageMapping(getNs2PkgMapping());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-	 */
-	public IStatus getStatus() 
-	{
-		IStatus result = null;
-		return result;
-	}
-
-	private void populatePackageName() {
-		this.packageText.setText(reader.packageFromTargetNamespace());
-	}
-
-	/**
-	 * populate the service and the port from the WSDL this needs to be public
-	 * since the WSDLselection page may call this
-	 */
-	public void populateParamsFromWSDL() {
-		if (reader == null)
-			reader = new WSDLPropertyReader();
-		try {
-			String lname = model.getWsdlURI();
-			if (!"".equals(lname.trim())) {
-
-				reader.readWSDL(model.getWebProjectName(), lname);
-
-				this.serviceQNameList = reader.getServiceList();
-				if (!serviceQNameList.isEmpty()) {
-					serviceNameCombo.removeAll();
-					for (int i = 0; i < serviceQNameList.size(); i++) {
-						// add the local part of the
-						Object serviceQnameInstance = serviceQNameList.get(0);
-						Class QNameClass = ClassLoadingUtil
-										.loadClassFromAntClassLoader("javax.xml.namespace.QName");
-						Method GetLocalPartMethod  = QNameClass.getMethod("getLocalPart", null);
-						Object resultLocalPart = GetLocalPartMethod
-													.invoke(serviceQnameInstance, null);
-						serviceNameCombo.add(resultLocalPart.toString());
-					}
-					;
-					// select the first one as the default
-					serviceNameCombo.select(0);
-
-					// load the ports
-					loadPortNames();
-
-				} else {
-					// service name list being empty means we are switching to
-					// the interface mode
-					if (serviceNameCombo!=null) serviceNameCombo.removeAll();
-					if (portNameCombo!=null) portNameCombo.removeAll();
-
-				}
-
-				populatePackageName();
-
-				//populate the namespacess
-				loadNamespaces(reader.getDefinitionNamespaceMap());
-			}
-		} catch (Exception e) {
-			if (e.getClass().getName().equals("javax.wsdl.WSDLException"))
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_WSDL_FILE_READ_WRITEL,
-							 new String[]{e.getLocalizedMessage()}), e);
-		}
-	}
-
-	private void loadPortNames() {
-		int selectionIndex = serviceNameCombo.getSelectionIndex();
-		if (selectionIndex != -1) {
-			java.util.List ports = reader.getPortNameList(serviceQNameList
-					.get(selectionIndex));
-			if (!ports.isEmpty()) {
-				portNameCombo.removeAll();
-				for (int i = 0; i < ports.size(); i++) {
-					// add the local part of the
-					portNameCombo.add(ports.get(i).toString());
-				}
-				portNameCombo.select(0);
-			} else {
-				// TODO error no ports found
-			}
-		}
-	}
-
-	/**
-	 * Fill the combo with proper databinding names
-	 */
-	private void fillDatabinderCombo() {
-		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_ADB);
-		databindingTypeCombo.add(Axis2Constants.DATA_BINDING_NONE);
-		databindingTypeCombo.select(0);
-	}
-	
-	
-	/**
-	 * A util method to create a new column
-	 * @param table
-	 * @param width
-	 * @param colName
-	 */
-	private void declareColumn(Table table, int width,String colName){
-        TableColumn column = new TableColumn(table,SWT.NONE);
-        column.setWidth(width);
-        column.setText(colName);
-    }
-	
-	/**
-	 * Loads the namespaces
-	 * @param namespaceMap
-	 */
-	private void loadNamespaces(Map namespaceMap){
-		Iterator namespaces = namespaceMap.values().iterator();
-		namespace2packageTable.removeAll();
-        TableItem[] items = new TableItem[namespaceMap.size()]; // An item for each field
-        int i = 0;
-        while(namespaces.hasNext()){
-        	
-           items[i] = new TableItem(namespace2packageTable, SWT.NULL);
-           String namespace = (String)namespaces.next();
-           items[i].setText(0,namespace);
-           items[i].setText(1,getPackageFromNamespace(namespace));
-           i++;
-        }
-        namespace2packageTable.setVisible(true);
-	}
-	
-	/**
-	 * get the package to namespace mappings
-	 * @return
-	 */
-	public String getNs2PkgMapping(){
-		String returnList="";
-		TableItem[] items = namespace2packageTable.getItems();
-		String packageValue; 
-		for (int i=0;i<items.length;i++){
-			packageValue = items[i].getText(1);
-			if (packageValue!=null && !"".equals(packageValue)){
-				returnList = returnList +
-				             ("".equals(returnList)?"":",") +
-				             items[i].getText(0)+ "=" + packageValue;
-			}
-			
-		}
-		return "".equals(returnList)?null:returnList;
-	}
-	
-	
-	/**
-	 * get the package derived by  Namespace
-	 */
-	public String getPackageFromNamespace(String namespace){
-		
-		Object result = null;
-		try {
-			//Class URLProcessor = Class.forName("org.apache.axis2.util.URLProcessor");
-			Class URLProcessor = ClassLoadingUtil
-						.loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
-			Class parameterTypes[] = new Class[1];
-			parameterTypes[0] = String.class;
-			Method makePackageNameMethod = URLProcessor
-									.getMethod("makePackageName", parameterTypes);
-			Object args[] = new Object[1];
-			args[0] = namespace;
-			result = makePackageNameMethod.invoke(makePackageNameMethod, args);
-		} catch (SecurityException e) {
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			e.printStackTrace();
-		} catch (IllegalArgumentException e) {
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			e.printStackTrace();
-		}
-		return (String)result;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2BeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2BeanConfigWidgetFactory.java
deleted file mode 100644
index 3cae7fb..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2BeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070425   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070601   190505 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2DefaultingCommand;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.bean.ServicesXMLSelectBeanWidget;
-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;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-
-public class Axis2BeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private SimpleWidgetContributor  servicesXMLSelectWidgetContrib;
-	private DataModel                model;
-
-	public Axis2BeanConfigWidgetFactory(){	  
-	}
-
-	public INamedWidgetContributor getFirstNamedWidget(){
-		if( servicesXMLSelectWidgetContrib == null ) init();
-		return servicesXMLSelectWidgetContrib;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor){
-		if( servicesXMLSelectWidgetContrib == null ) init();
-		INamedWidgetContributor nextWidgetContrib = null;
-		return nextWidgetContrib;
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-		// Map the data model from the defaulting command to this widget factory.
-		// The framework will actually to the call to getWebServiceDataModel in
-		// the ExampleDefaultingCommand class and then call the setWebServiceDataModel
-		// method in this class.
-		dataRegistry.addMapping( Axis2DefaultingCommand.class, 
-		                         "WebServiceDataModel",  //$NON-NLS-1$
-								             Axis2BeanConfigWidgetFactory.class );
-	}
-
-	public void setWebServiceDataModel( DataModel model ){
-		this.model = model;
-	}
-
-	private void init(){
-		//Pages of Axis2 Web Services Java Bean Scenario
-		ServicesXMLSelectBeanWidget servicesXMLSelectWidget = 
-								new ServicesXMLSelectBeanWidget(model);
-		servicesXMLSelectWidgetContrib  = createWidgetContributor( 
-				Axis2CreationUIMessages.LABEL_AXIS2_PREFERENCE_PAGE_HEADING,
-				Axis2CreationUIMessages.LABEL_AXIS2_PREFERENCE_PAGE_SUB_HEADING, 
-				servicesXMLSelectWidget );
-	}
-
-	private SimpleWidgetContributor createWidgetContributor(String title, 
-															String description, 
-															final WidgetDataContributor contributor){
-		SimpleWidgetContributor widgetContrib  = new SimpleWidgetContributor();
-		widgetContrib.setTitle(title);
-		widgetContrib.setDescription(description);
-		widgetContrib.setFactory( new WidgetContributorFactory(){
-			public WidgetContributor create(){
-				return contributor;
-			}
-		});
-		return widgetContrib;
-	}   
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2CheckWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2CheckWSDLCommand.java
deleted file mode 100644
index cb4d3ac..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2CheckWSDLCommand.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20080129   209411 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-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.axis2.consumption.core.utils.ServicePingUtil;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2CheckWSDLCommand extends AbstractDataModelOperation{
-	
-	private Axis2WebService ws_;
-
-	private String wsdlURI_;
-	
-	public Axis2CheckWSDLCommand() {
-	}
-	
-	public Axis2CheckWSDLCommand(Axis2WebService ws) {
-		ws_ = ws;
-
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-	 	
-	 	wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-		try {
-			ServicePingUtil servicePingUtil = new ServicePingUtil();
-			servicePingUtil.connectToURL(wsdlURI_);
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		} catch (Exception e) {
-			if (e instanceof IOException) {
-				try {
-					throw new ExecutionException(e.getMessage());
-				} catch (ExecutionException e1) {
-					// TODO Auto-generated catch block
-					e1.printStackTrace();
-				}
-			} else {
-				e.printStackTrace();
-			}
-		}
-		return Status.OK_STATUS;
-	  }
-	
-
-
-	public String getWsdlURI() {
-		return wsdlURI_;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2SkelConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2SkelConfigWidgetFactory.java
deleted file mode 100644
index c21706f..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2SkelConfigWidgetFactory.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070601   190505 pmoogk@ca.ibm.com - Peter Moogk
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2DefaultingCommand;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.jst.ws.internal.axis2.creation.ui.widgets.skeleton.WSDL2JAVASkelConfigWidget;
-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;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-
-public class Axis2SkelConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private SimpleWidgetContributor  skelConfig1WidgetContrib;
-	private DataModel                model;
-
-	public Axis2SkelConfigWidgetFactory(){	  
-	}
-
-	public INamedWidgetContributor getFirstNamedWidget(){
-		if( skelConfig1WidgetContrib == null ) init();
-		return skelConfig1WidgetContrib;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor){
-		if( skelConfig1WidgetContrib == null ) init();
-		INamedWidgetContributor nextWidgetContrib = null;
-		return nextWidgetContrib;
-	}
-
-	public void registerDataMappings(DataMappingRegistry dataRegistry){
-		// Map the data model from the defaulting command to this widget factory.
-		// The framework will actually to the call to getWebServiceDataModel in
-		// the ExampleDefaultingCommand class and then call the setWebServiceDataModel
-		// method in this class.
-		dataRegistry.addMapping( Axis2DefaultingCommand.class, 
-                             "WebServiceDataModel",  //$NON-NLS-1$
-								             Axis2SkelConfigWidgetFactory.class );
-	}
-
-	public void setWebServiceDataModel( DataModel model ){
-		this.model = model;
-	}
-
-	private void init(){
-		WSDL2JAVASkelConfigWidget  skel1 = new WSDL2JAVASkelConfigWidget( model );
-
-		skelConfig1WidgetContrib  = createWidgetContributor( 
-				Axis2CreationUIMessages.LABEL_JAVA_2_WSDL_PAGE_HEADING,
-				Axis2CreationUIMessages.LABEL_JAVA_2_WSDL_PAGE_SUB_HEADING, 
-				skel1 );
-	}
-
-	private SimpleWidgetContributor createWidgetContributor(String title, 
-															String description, 
-															final WidgetDataContributor contributor){
-		SimpleWidgetContributor widgetContrib  = new SimpleWidgetContributor();
-		widgetContrib.setTitle(title);
-		widgetContrib.setDescription(description);
-		widgetContrib.setFactory( new WidgetContributorFactory(){
-			public WidgetContributor create(){
-				return contributor;
-			}
-		});
-
-		return widgetContrib;
-	}   
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebService.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebService.java
deleted file mode 100644
index 23a4479..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebService.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 runtime to the framework for 168762
- * 20070425   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070815   187840 sandakith@wso2.com - Lahiru Sandakith
- * 20080129   209411 kathy@ca.ibm.com - Kathy Chan
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2BUCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2BUServiceCreationCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2BuildProjectCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2CleanupCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2DefaultingCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2ServicesXMLValidationCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2SkelImplCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2TDCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2TDServiceCreationCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2WSDL2JavaCommand;
-import org.eclipse.jst.ws.axis2.creation.core.command.Axis2WebservicesServerCommand;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-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.AbstractWebService;
-import org.eclipse.wst.ws.internal.wsrt.IContext;
-import org.eclipse.wst.ws.internal.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class Axis2WebService extends AbstractWebService
-{
-//	private Axis2WebServiceInfo axis2WebServiceInfo;
-
-	public Axis2WebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(IEnvironment env, IContext ctx,
-			ISelection sel, String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		Vector commands = new Vector();
-		DataModel model = new DataModel();
-		//EclipseEnvironment environment = (EclipseEnvironment)env;
-
-		model.setWebProjectName(project);
-
-		if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP)	{ 
-			commands.add(new Axis2DefaultingCommand( model,this, ctx.getScenario().getValue() ) );
-			commands.add(new Axis2BUCommand( model ) );
-			commands.add(new Axis2ServicesXMLValidationCommand());
-			commands.add(new Axis2BUServiceCreationCommand(model,this,project));
-			commands.add(new Axis2WebservicesServerCommand(model, ctx.getScenario().getValue() ));
-			//Including command to build for the fix 187840
-			commands.add( new Axis2BuildProjectCommand(
-					ResourcesPlugin.getWorkspace().getRoot().getProject(project),true));
-		} 
-		else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {  
-			commands.add(new Axis2DefaultingCommand( model,this, ctx.getScenario().getValue()  ) );
-			commands.add(new Axis2TDCommand( model) );
-			commands.add(new Axis2WSDL2JavaCommand( model) );
-			commands.add( new Axis2BuildProjectCommand(
-						ResourcesPlugin.getWorkspace().getRoot().getProject(project),true));
-			commands.add(new Axis2TDServiceCreationCommand(model,this,project));
-			commands.add(new Axis2WebservicesServerCommand(model, ctx.getScenario().getValue()));
-			//yes, again invoke the build command to redeploy the service after complete full build
-			commands.add( new Axis2BuildProjectCommand(
-						ResourcesPlugin.getWorkspace().getRoot().getProject(project),true));
-			commands.add(new Axis2SkelImplCommand(this.getWebServiceInfo(),model));
-			commands.add(new Axis2CleanupCommand());
-		} 
-		else 
-		{
-			return null;
-		}
-
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(IEnvironment env, IContext ctx, ISelection sel,
-			String project, String earProject)
-	{
-		Vector commands = new Vector();
-
-		
-			commands.add(new Axis2CheckWSDLCommand(this));
-			
-
-			return new SimpleCommandFactory(commands);
-
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceInfo.java
deleted file mode 100644
index 5235e9d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceInfo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-public class Axis2WebServiceInfo {
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceRuntime.java
deleted file mode 100644
index 0dfb583..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/src/org/eclipse/jst/ws/internal/axis2/creation/ui/wsrt/Axis2WebServiceRuntime.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis2.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis2.consumption.ui.wsrt.Axis2WebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class Axis2WebServiceRuntime extends AbstractWebServiceRuntime
-{
-
-	public IWebService getWebService(WebServiceInfo info){
-		return new Axis2WebService(info);
-	}
-
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info){
-		return new Axis2WebServiceClient(info);
-	}
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/.classpath b/bundles/org.eclipse.jst.ws.axis2.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<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="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/.project b/bundles/org.eclipse.jst.ws.axis2.ui/.project
deleted file mode 100644
index acc7e17..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.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.axis2.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c69c26a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Tue Mar 20 10:45:38 LKT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7d30760..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis2.ui;singleton:=true
-Bundle-Version: 1.0.201.qualifier
-Bundle-Activator: org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.axis2.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.axis2.ui.plugin,
- org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/about.html b/bundles/org.eclipse.jst.ws.axis2.ui/about.html
deleted file mode 100644
index 9e73bda..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/build.properties b/bundles/org.eclipse.jst.ws.axis2.ui/build.properties
deleted file mode 100644
index 9e0863d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial API Contribution
-# 20070502   184302 sandakith@wso2.com - Lahiru Sandakith, Fix copyright for Axis2 plugins
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.ui/plugin.properties
deleted file mode 100644
index 6a63c11..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 WSO2 Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# WSO2 Inc. - initial API and implementation
-# yyyymmdd bug      Email and other contact information
-# -------- -------- -----------------------------------------------------------
-# 20070118   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 runtime to the framework for 168762
-# 20070501   184617 sandakith@wso2.com - Lahiru Sandakith, Provide plugin details
-###############################################################################
-#
-
-#
-# Messages in plugin.xml.
-PLUGIN_NAME=Webservice Axis2 UI Plug-in
-PLUGIN_PROVIDER=WSO2
-
-# Web Services Preferance Pages
-# Categories
-PREFERENCE_CATEGORY_AXIS2_RUNTIME=Axis2 Preferences 
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.ui/plugin.xml
deleted file mode 100644
index 5f22106..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<plugin>
-  
-   <extension point="org.eclipse.ui.preferencePages">     
-      <page
-            name="%PREFERENCE_CATEGORY_AXIS2_RUNTIME"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences.Axis2RuntimePreferencePage"
-            id="org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences.Axis2RuntimePreferencePage">
-      </page>
-   </extension>
-   
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/axis2/ui/plugin/WebServiceAxis2UIPlugin.java b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/axis2/ui/plugin/WebServiceAxis2UIPlugin.java
deleted file mode 100644
index adba846..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/axis2/ui/plugin/WebServiceAxis2UIPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070425   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.ui.plugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2UIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.ui";
-
-	// The shared instance
-	private static WebServiceAxis2UIPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2UIPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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 WebServiceAxis2UIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
deleted file mode 100644
index 0fe6514..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 WSO2 Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * WSO2 Inc. - initial API and implementation
- * yyyymmdd bug      Email and other contact information
- * -------- -------- -----------------------------------------------------------
- * 20070130   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- *                      runtime to the framework for 168762
- * 20070425   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- * 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
- * 20070513   186430 sandakith@wso2.com - Lahiru Sandakith, fix for 186430
- *                      Text not accessible on AXIS2 wizard pages.
- * 20070516   183147 sandakith@wso2.com - Lahiru Sandakith Fix for the persisting DBCS paths
- * 20070523   174876 sandakith@wso2.com - Lahiru Sandakith, Persist Preferences inside Framework
- * 20070603   188740 sandakith@wso2.com - Lahiru Sandakith, 
- * 20070604   190505 sandakith@wso2.com - Lahiru Sandakith, 
- * 20070604   190067 pmoogk@ca.ibm.com - Peter Moogk
- * 20070824   200515 sandakith@wso2.com - Lahiru Sandakith, NON-NLS move to seperate file
- * 20070827   188732 sandakith@wso2.com - Lahiru Sandakith, Restore defaults for preferences
- * 20071030	  207618 zina@ca.ibm.com - Zina Mostafia, Page GUI sequence using tab is not correct ( violates Accessibility)
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.axis2.core.constant.Axis2Constants;
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterContext;
-import org.eclipse.jst.ws.axis2.core.context.Axis2EmitterDefaults;
-import org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
-import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
-import org.eclipse.jst.ws.axis2.ui.plugin.WebServiceAxis2UIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class Axis2RuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Text axis2Path; 
-	private Text statusLabel;
-	private Combo aarExtensionCombo; 
-	private Combo serviceDatabindingCombo;
-	private Combo clientDatabindingCombo;
-	private Button generateServerSideInterfaceCheckBoxButton;
-	private Button generateAllCheckBoxButton;
-	private Button syncAndAsyncRadioButton;
-	private Button syncOnlyRadioButton;
-	private Button asyncOnlyRadioButton;
-	private Button clientTestCaseCheckBoxButton;
-	private Button clientGenerateAllCheckBoxButton;
-
-	protected Control createContents(Composite superparent) {
-		
-		UIUtils uiUtils = new UIUtils(WebServiceAxis2UIPlugin.PLUGIN_ID);
-		final Composite  mainComp = uiUtils.createComposite(superparent, 1);
-		
-		TabFolder axis2PreferenceTab = new TabFolder(mainComp, SWT.WRAP);
-		axis2PreferenceTab.setLayoutData( new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH) );
-
-		
-		//-----------------------------Axis2 Runtime Location Group------------------------------//
-		TabItem runtimeInstalLocationItem = new TabItem(axis2PreferenceTab, SWT.WRAP);
-		runtimeInstalLocationItem.setText(Axis2CoreUIMessages.AXIS2_RUNTIME);
-		runtimeInstalLocationItem.setToolTipText(Axis2CoreUIMessages.AXIS2_RUNTIME_TOOLTIP);
-		
-		Composite runtimeTab = uiUtils.createComposite(axis2PreferenceTab, 1);
-		runtimeTab.setLayoutData( new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH ) );
-		Composite runtimeGroup = uiUtils.createComposite(runtimeTab, 3);
-
-		runtimeInstalLocationItem.setControl(runtimeTab);
-		runtimeTab.setToolTipText(Axis2CoreUIMessages.AXIS2_RUNTIME_TOOLTIP);
-
-		axis2Path = uiUtils.createText(runtimeGroup, Axis2CoreUIMessages.AXIS2_RUNTIME_LOCATION , null, null , SWT.BORDER);
-		
-		Button browseButton = uiUtils.createPushButton(runtimeGroup, Axis2CoreUIMessages.LABEL_BROUSE, null, null);
-		browseButton.addSelectionListener( new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleBrowse(mainComp.getShell());
-			}     
-		}); 
-
-		axis2Path.addModifyListener( new ModifyListener(){
-			public void modifyText(ModifyEvent e){
-				statusUpdate(runtimeExist(axis2Path.getText()));
-				// runtimeTab.layout();
-			}
-		});
-		new org.eclipse.swt.widgets.Label(runtimeTab, SWT.HORIZONTAL);  // Leave some vertical space.
-		statusLabel = new Text(runtimeTab, SWT.BACKGROUND | SWT.READ_ONLY | SWT.CENTER | SWT.WRAP | SWT.H_SCROLL);
-		statusLabel.setLayoutData( new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.FILL_BOTH) );
-
-		//--------------------------------Axis2 Runtime Preferences------------------------------//
-
-		TabItem codegenPreferencesItem = new TabItem(axis2PreferenceTab, SWT.WRAP);
-		codegenPreferencesItem.setText(Axis2CoreUIMessages.AXIS2_PREFERENCES);
-		codegenPreferencesItem.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
-
-		Composite codegenGroup = uiUtils.createComposite(axis2PreferenceTab, 1);
-		codegenPreferencesItem.setControl(codegenGroup);
-		codegenGroup.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-
-		//Service Codegen Options
-		Composite serviceCodegenGroup = uiUtils.createComposite(codegenGroup, 1);
-
-		Text serviceCodegenGroupLabel= new Text(serviceCodegenGroup, SWT.READ_ONLY |SWT.WRAP);
-		serviceCodegenGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_CODEGEN);
-
-		Composite dataBindComp = uiUtils.createComposite(serviceCodegenGroup, 2);
-		//Data binding
-		serviceDatabindingCombo = uiUtils.createCombo(dataBindComp, Axis2CoreUIMessages.LABEL_DATABINDING, null, null, SWT.READ_ONLY);
-
-		//the server side interface option
-		generateServerSideInterfaceCheckBoxButton = uiUtils.createCheckbox(serviceCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_SERVERSIDE_INTERFACE, null, null);
-
-		// generate all
-		generateAllCheckBoxButton = uiUtils.createCheckbox(serviceCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_ALL, null,null);
-
-		uiUtils.createHorizontalSeparator(codegenGroup,2);
-		///////////////////////////////////////////////////////////////////////////////////////////
-
-		///Client Codegen Options
-		Composite clientCodegenGroup = uiUtils.createComposite(codegenGroup, 1);
-		Text clientCodegenGroupLabel= new Text(clientCodegenGroup, SWT.READ_ONLY);
-		clientCodegenGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_CLIENT_CODEGEN);
-
-		Group clientModeRadioComp = uiUtils.createGroup(clientCodegenGroup, Axis2CoreUIMessages.LABEL_CLIENT_SIDE, null, null);
-
-		//client side buttons
-		syncAndAsyncRadioButton = uiUtils.createRadioButton(clientModeRadioComp, Axis2CoreUIMessages.LABEL_SYNC_AND_ASYNC, null, null);
-		syncOnlyRadioButton 	= uiUtils.createRadioButton(clientModeRadioComp,Axis2CoreUIMessages.LABEL_SYNC, null, null);
-		asyncOnlyRadioButton 	= uiUtils.createRadioButton(clientModeRadioComp, Axis2CoreUIMessages.LABEL_ASYNC, null, null);
-
-		Composite dataBind = uiUtils.createComposite(clientCodegenGroup, 2);
-		clientDatabindingCombo = uiUtils.createCombo(dataBind, Axis2CoreUIMessages.LABEL_DATABINDING, null, null, SWT.READ_ONLY);
-
-		// generate test case option
-		clientTestCaseCheckBoxButton = uiUtils.createCheckbox(clientCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_TESTCASE_CAPTION, null, null);
-
-		// generate all
-		clientGenerateAllCheckBoxButton = uiUtils.createCheckbox(clientCodegenGroup, Axis2CoreUIMessages.LABEL_GENERATE_ALL, null, null);
-
-
-		uiUtils.createHorizontalSeparator(codegenGroup,2);
-
-		///////////////////////////////////////////////////////////////////////////////////////////
-
-		///AAR Options
-		Composite aarGroup = uiUtils.createComposite(codegenGroup,1);
-
-		Text arrGroupLabel= new Text(aarGroup, SWT.READ_ONLY);
-		arrGroupLabel.setText(Axis2CoreUIMessages.LABEL_WEB_SERVICE_AAR);
-
-		Composite aarExtGroup = uiUtils.createComposite(aarGroup,2);
-
-		//aar extention 
-		aarExtensionCombo = uiUtils.createCombo(aarExtGroup, Axis2CoreUIMessages.LABEL_AAR_EXTENTION, null, null, SWT.READ_ONLY );
-
-		initializeValues();
-		axis2PreferenceTab.setEnabled(true);
-		axis2PreferenceTab.setVisible(true);
-		return mainComp;
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-
-	/**
-	 * Pops up the file browse dialog box
-	 */
-	private void handleBrowse(Shell parent) {
-		DirectoryDialog fileDialog = new DirectoryDialog(parent);
-		String fileName = fileDialog.open();
-		if (fileName != null) {
-			axis2Path.setText(fileName);
-		}
-	}
-
-	private void statusUpdate(boolean status){
-		if(statusLabel != null){
-			if(!axis2Path.getText().equals("")){
-				if (status) {
-					statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD);
-				} else {
-					statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD_ERROR);
-				}
-			}else{
-				statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_NOT_EXIT);
-			}
-		}
-	}
-
-	private boolean runtimeExist(String path){
-
-		File axis2HomeDir = new File(path);
-		if (!axis2HomeDir.isDirectory()) 
-			return false;
-
-		String axis2LibPath = Axis2CoreUtils.addAnotherNodeToPath(axis2HomeDir.getAbsolutePath(), "lib");
-		String axis2WebappPath = Axis2CoreUtils.addAnotherNodeToPath(axis2HomeDir.getAbsolutePath(), "webapp");
-		if (new File(axis2LibPath).isDirectory() && new File(axis2WebappPath).isDirectory()) 
-			return true;
-		else {
-			String axis2WarPath = Axis2CoreUtils.addAnotherNodeToPath( path, "axis2.war");
-			if (new File(axis2WarPath).isFile()) {
-				RuntimePropertyUtils.writeWarStausToPropertiesFile(true);
-				return true;
-			} else 				
-				return false;
-		}
-	}
-
-	private void storeValues(){
-		// set values in the persistent context 
-		Axis2EmitterContext context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
-		context.setAxis2RuntimeLocation( axis2Path.getText());
-		RuntimePropertyUtils.writeServerPathToPropertiesFile(axis2Path.getText());
-		context.setServiceDatabinding(serviceDatabindingCombo.getItem(serviceDatabindingCombo.getSelectionIndex()));
-		context.setServiceInterfaceSkeleton( generateServerSideInterfaceCheckBoxButton.getSelection());
-		context.setServiceGenerateAll(generateAllCheckBoxButton.getSelection());
-		context.setAsync(asyncOnlyRadioButton.getSelection());
-		context.setSync(syncOnlyRadioButton.getSelection());
-		context.setClientDatabinding(clientDatabindingCombo.getItem(clientDatabindingCombo.getSelectionIndex()));
-		context.setClientTestCase(clientTestCaseCheckBoxButton.getSelection());
-		context.setClientGenerateAll(clientGenerateAllCheckBoxButton.getSelection());
-		context.setAarExtention(aarExtensionCombo.getText());
-	}
-
-	/**
-	 * Initializes states of the controls using default values
-	 * in the preference store.
-	 */
-	private void initializeDefaults() {
-		aarExtensionCombo.select(0);
-		serviceDatabindingCombo.select(0);
-		clientDatabindingCombo.select(0);
-		generateServerSideInterfaceCheckBoxButton.setSelection(Axis2EmitterDefaults.isServiceInterfaceSkeleton());
-		generateAllCheckBoxButton.setSelection(Axis2EmitterDefaults.isServiceGenerateAll());
-		syncAndAsyncRadioButton.setSelection(((Axis2EmitterDefaults.isClientSync() || Axis2EmitterDefaults.isClientAsync())==false)?true:
-			(Axis2EmitterDefaults.isClientSync()) && Axis2EmitterDefaults.isClientAsync());
-		syncOnlyRadioButton.setSelection( Axis2EmitterDefaults.isClientSync() && !Axis2EmitterDefaults.isClientAsync());
-		asyncOnlyRadioButton.setSelection(
-				Axis2EmitterDefaults.isClientAsync() && !Axis2EmitterDefaults.isClientSync());
-
-		clientTestCaseCheckBoxButton.setSelection(Axis2EmitterDefaults.isClientTestCase());
-		clientGenerateAllCheckBoxButton.setSelection(Axis2EmitterDefaults.isClientGenerateAll());
-		axis2Path.setText(Axis2EmitterDefaults.getAxis2RuntimeLocation());
-	}
-
-	private void initializeValues()
-	{
-		Axis2EmitterContext context = WebServiceAxis2CorePlugin.getDefault().getAxisEmitterContext();
-
-		String[] databindingItems = {context.getServiceDatabinding().toUpperCase()};
-		serviceDatabindingCombo.setItems(databindingItems);
-		serviceDatabindingCombo.select(0);
-		clientDatabindingCombo.setItems(databindingItems);
-		clientDatabindingCombo.select(0);
-
-		generateServerSideInterfaceCheckBoxButton.setSelection( context.isServiceInterfaceSkeleton());
-		generateAllCheckBoxButton.setSelection(context.isServiceGenerateAll());
-
-		syncAndAsyncRadioButton.setSelection(((context.isSync() || context.isAsync())==false) ?true
-				:(context.isSync()) && context.isAsync());
-		syncOnlyRadioButton.setSelection(context.isSync() && !context.isAsync() );
-		asyncOnlyRadioButton.setSelection(context.isAsync() && !context.isSync());
-
-		clientTestCaseCheckBoxButton.setSelection(context.isClientTestCase());
-		clientGenerateAllCheckBoxButton.setSelection(context.isClientGenerateAll());
-
-		String[] aarExtentionItems = { Axis2Constants.AAR };
-		aarExtensionCombo.setItems(aarExtentionItems);
-		aarExtensionCombo.select(0);
-		
-		String serverPath = context.getAxis2RuntimeLocation();
-		if ( serverPath != null){
-			axis2Path.setText(serverPath);
-			statusUpdate(runtimeExist(serverPath));
-			RuntimePropertyUtils.writeWarStausToPropertiesFile(false);
-		}
-		else
-			statusUpdate(false);
-	}
-
-	/**
-	 * Default button has been pressed.
-	 */
-	protected void performDefaults() {
-		super.performDefaults();
-		initializeDefaults();
-	}
-
-	/**
-	 * Apply button has been pressed.
-	 */
-	protected void performApply() {
-		performOk();
-	}
-
-	/**
-	 * OK button has been pressed.
-	 */	
-	public boolean performOk() {
-		storeValues();
-		return true;
-	}
-
-}